* tests/m4sh.at (AS_DIRNAME & AS_DIRNAME_SED): Simplify.

diff --git a/ChangeLog b/ChangeLog
index 79d1ac1c9ba87153e1c7d19b884c273b83469b35..361f41201fb5bf67a89661ac6deef5e84292a99a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-14  Akim Demaille  <akim@epita.fr>
+
+       * tests/m4sh.at (AS_DIRNAME & AS_DIRNAME_SED): Simplify.
+
+       
 2000-11-14  Akim Demaille  <akim@epita.fr>
 
        * acfunctions.m4 (AC_FUNC_ALLOCA): Don't require AC_PROG_CPP,

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 3ddbbd6d6eb7f162d0101be7b9360d397c514a4a..15e743a3661f41f2e3d5692feec38ae3aa27f7c5 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -2,7 +2,7 @@
 
 cat <<EOF
 
-Autoshell.
+M4sh.
 
 EOF
 
@@ -16,14 +16,12 @@ EOF
 AT_SETUP([AS_DIRNAME & AS_DIRNAME_SED])
 
 AT_DATA(configure.in,
-[[
-
-define([AS_DIRNAME_TEST],
+[[define([AS_DIRNAME_TEST],
 [dir=`AS_DIRNAME([$1])`
 test "$dir" = "$2" ||
-  echo "dirname($1) = $dir instead of $2" >&2])
-define([AS_DIRNAME_SED_TEST],
-[dir=`AS_DIRNAME_SED([$1])`
+  echo "dirname($1) = $dir instead of $2" >&2
+
+dir=`AS_DIRNAME_SED([$1])`
 test "$dir" = "$2" ||
   echo "dirname_sed($1) = $dir instead of $2" >&2])
 
@@ -48,27 +46,6 @@ AS_DIRNAME_TEST([//1//3/],   [//1])
 AS_DIRNAME_TEST([/1//3/],      [/1])
 AS_DIRNAME_TEST([./1//3/],     [./1])
 AS_DIRNAME_TEST([../../2//3/], [../../2])
-
-AS_DIRNAME_SED_TEST([//1],             [//])
-AS_DIRNAME_SED_TEST([/1],              [/])
-AS_DIRNAME_SED_TEST([./1],             [.])
-AS_DIRNAME_SED_TEST([../../2],         [../..])
-AS_DIRNAME_SED_TEST([//1/],            [//])
-AS_DIRNAME_SED_TEST([/1/],             [/])
-AS_DIRNAME_SED_TEST([./1/],            [.])
-AS_DIRNAME_SED_TEST([../../2],         [../..])
-AS_DIRNAME_SED_TEST([//1/3],           [//1])
-AS_DIRNAME_SED_TEST([/1/3],            [/1])
-AS_DIRNAME_SED_TEST([./1/3],           [./1])
-AS_DIRNAME_SED_TEST([../../2/3],       [../../2])
-AS_DIRNAME_SED_TEST([//1/3///],                [//1])
-AS_DIRNAME_SED_TEST([/1/3///],         [/1])
-AS_DIRNAME_SED_TEST([./1/3///],                [./1])
-AS_DIRNAME_SED_TEST([../../2/3///],    [../../2])
-AS_DIRNAME_SED_TEST([//1//3/],         [//1])
-AS_DIRNAME_SED_TEST([/1//3/],          [/1])
-AS_DIRNAME_SED_TEST([./1//3/],         [./1])
-AS_DIRNAME_SED_TEST([../../2//3/],     [../../2])
 AS_EXIT(0)
 ]])
 
@@ -85,7 +62,7 @@ AT_CLEANUP(configure)
 
 # Build nested dirs.
 
-AT_SETUP([AC_SHELL_MKDIR_P])
+AT_SETUP([AS_MKDIR_P])
 
 AT_DATA(configure.in,
 [[AC_PLAIN_SCRIPT