autoconf-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Autoconf source repository branch, master, updated. v2.63b-76-

From: Paolo Bonzini
Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-76-gca833ef
Date: Mon, 13 Jul 2009 11:36:44 +0000 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=ca833ef9f8645adf28781a9439723cbac8be2e22

The branch, master has been updated
       via  ca833ef9f8645adf28781a9439723cbac8be2e22 (commit)
       via  48e64006cefb6a583fd332947493313d63676622 (commit)
       via  967cf4d2820b508a84c0ba1fab49b63fce82d6ee (commit)
       via  991f80650d60a690b6a6016c514b70d444a1e334 (commit)
      from  524a5c5152b7c3d5f049a8da869056fcccc80449 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ca833ef9f8645adf28781a9439723cbac8be2e22
Author: Paolo Bonzini <address@hidden>
Date:   Sun Jul 12 13:50:24 2009 +0200

    use m4 -g when available
    
    M4sugar requires GNU m4 extensions to be enabled.  Override
    POSIXLY_CORRECT using -g.
    
    2009-07-12  Paolo Bonzini  <address@hidden>
    
        * m4/m4.m4: Test for -g.
        * bin/Makefile.am: Substitute @M4_GNU@ into generated files.
        * bin/autom4te.in: Pass @M4_GNU@ to m4.

commit 48e64006cefb6a583fd332947493313d63676622
Author: Paolo Bonzini <address@hidden>
Date:   Sun Jul 12 12:58:36 2009 +0200

    Simplify handling of autotest tracing
    
    This patch simplifies at_fn_check_prepare_trace by noting that it
    need not call at_fn_check_prepare_notrace.  Instead we can make
    $at_traceon be ':' or 'set -x' instead of being empty when tracing
    is disabled.
    
    A similar approach is used for other variables set by
    at_fn_check_prepare_trace and to conditionalize the message
    about disabling tracing in at_fn_check_prepare_dynamic.
    
    In addition, I changed $at_traceoff to 'set +x' throughout and
    eliminated the variable.
    
    2009-07-12  Paolo Bonzini  <address@hidden>
    
        * lib/autotest/general.m4 (at_fn_check_prepare_notrace): Use
        $at_trace_echo.  Add new REASON argument.
        (at_fn_check_prepare_trace): Do not call at_fn_check_prepare_notrace.
        Use $at_check_filter_trace.
        (at_fn_check_prepare_dynamic): Use at_fn_check_prepare_notrace.
        (at_traceon): Initialize to ':'.
        (at_traceoff): Remove, use 'set -x' instead throughout.
        (at_check_filter_trace, at_trace_echo): New shell variables.
        Initialize them if tracing is requested.
        (_AT_DECIDE_TRACEABLE): Adjust call to at_fn_check_prepare_notrace.

commit 967cf4d2820b508a84c0ba1fab49b63fce82d6ee
Author: Paolo Bonzini <address@hidden>
Date:   Sun Jul 12 12:22:39 2009 +0200

    introduce AT_SKIP_IF and AT_FAIL_IF
    
    These are lightweight versions of AT_CHECK that automatically
    add the equivalent of ! in front of the command and change a
    failure exit status to 77 resp. 99.  They expand to just
    two lines of shell code at the expense of not supporting
    tracing (but then so does AT_XFAIL_IF).
    
    2009-07-12  Paolo Bonzini  <address@hidden>
    
        * NEWS: Mention AT_SKIP_IF and AT_FAIL_IF.
        * doc/autoconf.texi (Autotest): Document them.
        * lib/autotest/general.m4 (_AT_LINE_ESCAPED, AT_SKIP_IF,
        AT_FAIL_IF, _AT_CHECK_EXIT): New.
        (AT_CHECK): Use _AT_LINE_ESCAPED.
        * tests/autotest.st: Add tests for AT_SKIP_IF and AT_FAIL_IF.
        Use AT_SKIP_IF.
        * tests/local.st: Use AT_SKIP_IF.

commit 991f80650d60a690b6a6016c514b70d444a1e334
Author: Paolo Bonzini <address@hidden>
Date:   Sun Jul 12 11:28:57 2009 +0200

    Move atlocal code to configure
    
    This test makes atlocal code use configure tests instead.  This
    is best practice and could make diagnosing autoconf bugs easier.
    
    2009-07-12  Paolo Bonzini  <address@hidden>
    
        * configure.ac: Test for unsupported characters in files and
        directories here...
        * tests/atlocal.in: ... and not here.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                    |    3 ++
 bin/Makefile.am         |    1 +
 bin/autom4te.in         |    2 +-
 configure.ac            |   31 +++++++++++++++++
 doc/autoconf.texi       |   38 +++++++++++++++++++++
 lib/autotest/general.m4 |   83 +++++++++++++++++++++++++++++++++++------------
 m4/m4.m4                |   11 ++++++
 tests/atlocal.in        |   27 ++++-----------
 tests/autotest.at       |   59 ++++++++++++++++++++++++++++++++-
 tests/local.at          |    4 +-
 10 files changed, 214 insertions(+), 45 deletions(-)

diff --git a/NEWS b/NEWS
index 93a09c9..873fcde 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,9 @@ GNU Autoconf NEWS - User visible changes.
 ** Autotest testsuites do not attempt to write startup error messages
    to the log file before that is opened (regression introduced in 2.63).
 
+** The following Autotest macros are new:
+   AT_SKIP_IF  AT_FAIL_IF
+
 ** Configure scripts now use shell functions.  This feature leads to
    smaller configure files and faster execution.
 
diff --git a/bin/Makefile.am b/bin/Makefile.am
index ba88ab0..da65b85 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -46,6 +46,7 @@ edit = sed \
        -e 's|@address@hidden|'`echo autom4te | sed '$(transform)'`'|g' \
        -e 's|@address@hidden|$(M4)|g' \
        -e 's|@address@hidden|$(M4_DEBUGFILE)|g' \
+       -e 's|@address@hidden|$(M4_GNU)|g' \
        -e 's|@address@hidden|$(AWK)|g' \
        -e 's|@address@hidden|'$(RELEASE_YEAR)'|g' \
        -e 's|@address@hidden|$(VERSION)|g' \
diff --git a/bin/autom4te.in b/bin/autom4te.in
index cf425bb..1baf507 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -463,7 +463,7 @@ sub handle_m4 ($@)
   #
   # We don't output directly to the cache files, to avoid problems
   # when we are interrupted (that leaves corrupted files).
-  xsystem ("$m4"
+  xsystem ("$m4 @M4_GNU@"
           . join (' --include=', '', map { shell_quote ($_) } @include)
           . ' --debug=aflq'
           . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
diff --git a/configure.ac b/configure.ac
index a5fcad0..d909528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,37 @@ fi
 ])
 AC_SUBST([ac_cv_sh_n_works])
 
+AC_MSG_CHECKING([for characters that cannot appear in file names])
+AC_CACHE_VAL( [ac_cv_unsupported_fs_chars],
+[ac_cv_unsupported_fs_chars=
+for c in '\\' '"' '<' '>' '*' '?' '|'
+do
+  touch "t${c}t" 2>/dev/null
+  test -f "t${c}t" && rm -f "t${c}t" && continue
+  # $c cannot be used in a file name.
+  ac_cv_unsupported_fs_chars=$ac_cv_unsupported_fs_chars$c
+done
+])
+if test -n "$ac_cv_unsupported_fs_chars"; then
+  AC_MSG_RESULT([$ac_cv_unsupported_fs_chars])
+else
+  AC_MSG_RESULT([none])
+fi
+
+AC_SUBST([ac_cv_unsupported_fs_chars])
+
+AC_CACHE_CHECK([whether directories can have trailing spaces],
+              [ac_cv_dir_trailing_space],
+[rm -rf 'tdir ' && mkdir 'tdir ' && touch 'tdir /tfile' 2>/dev/null
+a=$?
+rm -rf 'tdir '
+case $a$? in #(
+   00) ac_cv_dir_trailing_space=yes ;; #(
+   *) ac_cv_dir_trailing_space=no ;;
+esac
+])
+AC_SUBST([ac_cv_dir_trailing_space])
+
 # Initialize the test suite.
 AC_CONFIG_TESTDIR([tests])
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3528f53..6772827 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22653,6 +22653,44 @@ If the current test group fails, log the contents of 
@var{file}.
 Several identical calls within one test group have no additional effect.
 @end defmac
 
address@hidden AT_FAIL_IF (@var{shell-condition})
address@hidden
+Make the test group fail, skipping the rest of its execution if
address@hidden is true.  @var{shell-condition} is a shell expression
+such as a @code{test} command.  Tests before @command{AT_FAIL_IF}
+will be executed and may still cause the test group to be skipped.
+You can instantiate this macro many times from within the same test group.
+
+You should use this macro only for very simple failure conditions.  If the
address@hidden could emit any kind of output you should instead
+use @command{AT_CHECK} like
address@hidden
+AT_CHECK(address@hidden || exit 99)
address@hidden example
address@hidden
+so that such output is properly recorded in the @file{testsuite.log}
+file.
address@hidden defmac
+
address@hidden AT_SKIP_IF (@var{shell-condition})
address@hidden
+Determine whether the test should be skipped because it requires
+features that are unsupported on the machine under test.
address@hidden is a shell expression such as a @code{test}
+command.  Tests before @command{AT_SKIP_IF} will be executed
+and may still cause the test group to fail.  You can instantiate this
+macro many times from within the same test group.
+
+You should use this macro only for very simple skip conditions.  If the
address@hidden could emit any kind of output you should instead
+use @command{AT_CHECK} like
address@hidden
+AT_CHECK(address@hidden || exit 77)
address@hidden example
+so that such output is properly recorded in the @file{testsuite.log}
+file.
address@hidden defmac
+
 @defmac AT_XFAIL_IF (@var{shell-condition})
 @atindex{XFAIL_IF}
 Determine whether the test is expected to fail because it is a known
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index a032462..d7370a9 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -168,6 +168,11 @@ m4_define([AT_LINE],
                         m4_bregexp(/__file__, [/\([^/]*\)$], [[\1]]))])])dnl
 m4_defn([_AT_LINE_base]):__line__])
 
+# _AT_LINE_ESCAPED
+# ----------------
+# Same as AT_LINE, but already escaped for the shell.
+m4_define([_AT_LINE_ESCAPED], ["AS_ESCAPE(m4_dquote(AT_LINE))"])
+
 
 # _AT_NORMALIZE_TEST_GROUP_NUMBER(SHELL-VAR)
 # ------------------------------------------
@@ -263,12 +268,13 @@ at_fn_banner ()
   AS_ECHO(["$as_nl$at_banner_text$as_nl"])
 } # at_fn_banner
 
-AS_FUNCTION_DESCRIBE([at_fn_check_prepare_notrace], [LINE],
+AS_FUNCTION_DESCRIBE([at_fn_check_prepare_notrace], [REASON LINE],
 [Perform AT_CHECK preparations for the command at LINE for an
-untraceable command, or when tracing is disabled.])
+untraceable command; REASON is the reason for disabling tracing.])
 at_fn_check_prepare_notrace ()
 {
-  AS_ECHO(["$[1]"]) >"$at_check_line_file"
+  $at_trace_echo "Not enabling shell tracing (command contains $1)"
+  AS_ECHO(["$[2]"]) >"$at_check_line_file"
   at_check_trace=: at_check_filter=:
   : >"$at_stdout"; : >"$at_stderr"
 }
@@ -278,13 +284,9 @@ AS_FUNCTION_DESCRIBE([at_fn_check_prepare_trace], [LINE],
 command.])
 at_fn_check_prepare_trace ()
 {
-  if test -n "$at_traceon"; then
-    AS_ECHO(["$[1]"]) >"$at_check_line_file"
-    at_check_trace=$at_traceon at_check_filter=at_fn_filter_trace
-    : >"$at_stdout"; : >"$at_stderr"
-  else
-    at_fn_check_prepare_notrace "$[1]"
-  fi
+  AS_ECHO(["$[1]"]) >"$at_check_line_file"
+  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+  : >"$at_stdout"; : >"$at_stderr"
 }
 
 AS_FUNCTION_DESCRIBE([at_fn_check_prepare_dynamic], [COMMAND LINE],
@@ -292,12 +294,9 @@ AS_FUNCTION_DESCRIBE([at_fn_check_prepare_dynamic], 
[COMMAND LINE],
 appropriate preparation function.])
 at_fn_check_prepare_dynamic ()
 {
-  case "$at_traceon:$[1]" in
-    :*$as_nl*)
-      at_fn_check_prepare_notrace "$[2]" ;;
+  case $[1] in
     *$as_nl*)
-      echo 'Not enabling shell tracing (command contains an embedded newline)'
-      at_fn_check_prepare_notrace "$[2]" ;;
+      at_fn_check_prepare_notrace 'an embedded newline' "$[2]" ;;
     *)
       at_fn_check_prepare_trace "$[2]" ;;
   esac
@@ -407,6 +406,9 @@ at_verbose=:
 at_quiet=
 # Running several jobs in parallel, 0 means as many as test groups.
 at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -522,7 +524,9 @@ do
        ;;
 
     --trace | -x )
-       at_traceon='set -x'; at_traceoff='set +x'
+       at_traceon='set -x'
+       at_trace_echo=echo
+       at_check_filter_trace=at_fn_filter_trace
        ;;
 
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
@@ -1776,6 +1780,36 @@ m4_divert_push([TEST_SCRIPT])dnl
 ])
 
 
+# AT_FAIL_IF(SHELL-EXPRESSION)
+# -----------------------------
+# Set up the test to be expected to fail if SHELL-EXPRESSION evaluates to
+# true (exitcode = 0).
+_AT_DEFINE_SETUP([AT_FAIL_IF],
+[dnl
+dnl Try to limit the amount of conditionals that we emit.
+m4_case([$1],
+      [], [],
+      [false], [],
+      [:], [_AT_CHECK_EXIT([], [99])],
+      [true], [_AT_CHECK_EXIT([], [99])],
+      [_AT_CHECK_EXIT([$1], [99])])])
+
+
+# AT_SKIP_IF(SHELL-EXPRESSION)
+# -----------------------------
+# Set up the test to be expected to fail if SHELL-EXPRESSION evaluates to
+# true (exitcode = 0).
+_AT_DEFINE_SETUP([AT_SKIP_IF],
+[dnl
+dnl Try to limit the amount of conditionals that we emit.
+m4_case([$1],
+      [], [],
+      [false], [],
+      [:], [_AT_CHECK_EXIT([], [77])],
+      [true], [_AT_CHECK_EXIT([], [77])],
+      [_AT_CHECK_EXIT([$1], [77])])])
+
+
 # AT_XFAIL_IF(SHELL-EXPRESSION)
 # -----------------------------
 # Set up the test to be expected to fail if SHELL-EXPRESSION evaluates to
@@ -1828,7 +1862,7 @@ echo "#                             -*- compilation -*-" 
>> "$at_group_log"
   AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $1..."])
   $at_traceon
 m4_undivert([TEST_SCRIPT])dnl Insert the code here
-  $at_traceoff
+  set +x
   $at_times_p && times >"$at_times_file"
 ) AS_MESSAGE_LOG_FD>&1 2>&1 | eval $at_tee_pipe
 read at_status <"$at_status_file"
@@ -2016,8 +2050,7 @@ m4_cond([m4_eval(m4_index([$1], [`]) >= 0)], [1],
        []))]dnl No reason.
 [m4_if(m4_index(_m4_defn([at_reason]), [a]), [0],]dnl
 dnl We know at build time that tracing COMMANDS is never safe.
-[[echo 'Not enabling shell tracing (command contains ]m4_defn([at_reason])[)'
-at_fn_check_prepare_notrace],
+[[at_fn_check_prepare_notrace 'm4_defn([at_reason])'],dnl
        m4_index([$1], [$]), [-1],]dnl
 dnl We know at build time that tracing COMMANDS is always safe.
 [[at_fn_check_prepare_trace],]dnl
@@ -2090,9 +2123,9 @@ m4_define([AT_DIFF_STDOUT()],
 # with parallel jobs.
 m4_define([_AT_CHECK],
 [m4_define([AT_ingroup])]dnl
-[{ $at_traceoff
+[{ set +x
 AS_ECHO(["$at_srcdir/AT_LINE: AS_ESCAPE([[$1]])"])
-_AT_DECIDE_TRACEABLE([$1]) "AS_ESCAPE(m4_dquote(AT_LINE))"
+_AT_DECIDE_TRACEABLE([$1]) _AT_LINE_ESCAPED
 ( $at_check_trace; [$1]
 ) >>"$at_stdout" 2>>"$at_stderr"
 at_status=$? at_failed=false
@@ -2109,3 +2142,11 @@ m4_ifvaln([$5$6], [AS_IF($at_failed, [$5], [$6])])]dnl
 [$at_failed && at_fn_log_failure AT_capture_files
 $at_traceon; }
 ])# _AT_CHECK
+
+# _AT_CHECK_EXIT(COMMANDS, [EXIT-STATUS-IF-PASS])
+# -----------------------------------------------
+# Minimal version of _AT_CHECK for AT_SKIP_IF and AT_FAIL_IF.
+m4_define([_AT_CHECK_EXIT],
+[m4_define([AT_ingroup])]dnl
+[AS_ECHO(_AT_LINE_ESCAPED) >"$at_check_line_file"
+m4_ifval([$1], [$1 && ])at_fn_check_skip $2])# _AT_CHECK_EXIT
diff --git a/m4/m4.m4 b/m4/m4.m4
index dd90cca..45e03fc 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -32,6 +32,17 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4],
       [AC_MSG_ERROR([no acceptable m4 could be found in \$PATH.
 GNU M4 1.4.5 or later is required; 1.4.11 is recommended])])])
   M4=$ac_cv_path_M4
+  AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts -g], [ac_cv_prog_gnu_m4_gnu],
+    [case `$M4 --help < /dev/null 2>&1` in
+      *--gnu*) ac_cv_prog_gnu_m4_gnu=yes ;;
+      *) ac_cv_prog_gnu_m4_gnu=no ;;
+    esac])
+  if test "$ac_cv_prog_gnu_m4_gnu" = yes; then
+    M4_GNU=-g
+  else
+    M4_GNU=
+  fi
+  AC_SUBST([M4_GNU])
   AC_CACHE_CHECK([how m4 supports trace files], [ac_cv_prog_gnu_m4_debugfile],
     [case `$M4 --help < /dev/null 2>&1` in
       *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
diff --git a/tests/atlocal.in b/tests/atlocal.in
index ad72c37..adce2bf 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -29,27 +29,16 @@ ac_cv_sh_n_works='@ac_cv_sh_n_works@'
 
 # Check whether the underlying system can manage some unusual
 # symbols in file names.
-unsupported_fs_chars=
-for c in '\\' '"' '<' '>' '*' '?' '|'
-do
-  touch "t${c}t" 2>/dev/null
-  test -f "t${c}t" && rm -f "t${c}t" && continue
-  # $c cannot be used in a file name.
-  unsupported_fs_chars=$unsupported_fs_chars$c
-done
-if test -z "$unsupported_fs_chars"; then
+if test -z '@ac_cv_unsupported_fs_chars@'; then
   func_sanitize_file_name () { echo "$@"; }
 else
-  func_sanitize_file_name () { echo "$@" | tr -d "$unsupported_fs_chars"; }
+  func_sanitize_file_name () { echo "$@" | tr -d 
'@ac_cv_unsupported_fs_chars@'; }
 fi
 
 # Can we create directories with trailing whitespaces in their name?
-rm -rf 'tdir ' && mkdir 'tdir ' && touch 'tdir /tfile' 2>/dev/null
-a=$?
-rm -rf 'tdir '
-case $a$? in #(
-00)
-  func_sanitize_dir_name () { echo "$@"; } ;; #(
-*)
-  func_sanitize_dir_name () { echo "$@" | sed 's/  *$//'; } ;;
-esac
+ac_cv_dir_trailing_space='@ac_cv_dir_trailing_space@'
+if test "$ac_cv_dir_trailing_space" = yes; then
+  func_sanitize_dir_name () { echo "$@"; }
+else
+  func_sanitize_dir_name () { echo "$@" | sed 's/  *$//'; }
+fi
diff --git a/tests/autotest.at b/tests/autotest.at
index 438c01d..d6bf58d 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -169,6 +169,21 @@ AT_SETUP([only test])
 AT_CHECK([:])
 ]], [missing AT@&address@hidden detected])
 
+AT_CHECK_AT_SYNTAX([AT@&address@hidden without AT@&address@hidden,
+[[AT_INIT([incomplete test suite])
+AT_FAIL_IF([:])
+]], [AT@&address@hidden: missing AT@&address@hidden detected])
+
+AT_CHECK_AT_SYNTAX([AT@&address@hidden without AT@&address@hidden,
+[[AT_INIT([incomplete test suite])
+AT_SKIP_IF([:])
+]], [AT@&address@hidden: missing AT@&address@hidden detected])
+
+AT_CHECK_AT_SYNTAX([AT@&address@hidden without AT@&address@hidden,
+[[AT_INIT([incomplete test suite])
+AT_CHECK([:])
+]], [AT@&address@hidden: missing AT@&address@hidden detected])
+
 AT_CHECK_AT_SYNTAX([AT@&address@hidden without AT@&address@hidden,
 [[AT_INIT([incomplete test suite])
 AT_CHECK([:])
@@ -263,6 +278,46 @@ AT_CHECK_AT_TEST([Hard fail],
   [AT_CHECK([grep '2 failed unexpectedly' micro-suite.log], [], [ignore])
    AT_CHECK([grep ok micro-suite.log], [1])])
 
+AT_CHECK_AT_TEST([AT@&address@hidden,
+  [AT_FAIL_IF([:])
+  AT_CLEANUP
+  AT_SETUP
+  AT_FAIL_IF([false])
+  AT_CLEANUP
+  AT_SETUP
+  AT_FAIL_IF([test x = y])
+  AT_CLEANUP
+  AT_SETUP
+  AT_FAIL_IF([bah])
+  AT_CLEANUP
+  AT_SETUP
+  AT_FAIL_IF([test x = x])
+  AT_CLEANUP
+  AT_SETUP
+  AT_FAIL_IF([test $foo = x])],
+  [], [1], [stdout], [ignore], [],
+  [AT_CHECK([grep '1 5 failed' stdout], [], [ignore], [ignore])])
+
+AT_CHECK_AT_TEST([AT@&address@hidden,
+  [AT_SKIP_IF([:])
+  AT_CLEANUP
+  AT_SETUP
+  AT_SKIP_IF([false])
+  AT_CLEANUP
+  AT_SETUP
+  AT_SKIP_IF([test x = y])
+  AT_CLEANUP
+  AT_SETUP
+  AT_SKIP_IF([bah])
+  AT_CLEANUP
+  AT_SETUP
+  AT_SKIP_IF([test x = x])
+  AT_CLEANUP
+  AT_SETUP
+  AT_SKIP_IF([test $foo = x])],
+  [], [], [], [], [],
+  [AT_CHECK([grep '2.*skipped' micro-suite.log], [], [ignore], [ignore])])
+
 AT_CHECK_AT_TEST([Syntax error],
   [AT_CHECK([:])
    AT_CLEANUP
@@ -990,8 +1045,8 @@ m4_define([AT_SKIP_PARALLEL_TESTS],
 [# Per BUGS, we have not yet figured out how to run parallel tests cleanly
 # under dash and some ksh variants.  For now, only run this test under
 # limited conditions; help is appreciated in widening this test base.
-AT_CHECK([${CONFIG_SHELL-$SHELL} -c 'test -n "${BASH_VERSION+set}]]dnl
-[[${ZSH_VERSION+set}${TEST_PARALLEL_AUTOTEST+set}"' || exit 77])
+AT_SKIP_IF([${CONFIG_SHELL-$SHELL} -c 'test -z "${BASH_VERSION+set}]]dnl
+[[${ZSH_VERSION+set}${TEST_PARALLEL_AUTOTEST+set}"'])
 # The parallel scheduler requires mkfifo and job control to work.
 AT_CHECK([mkfifo fifo || exit 77])
 AT_CHECK([${CONFIG_SHELL-$SHELL} -c '(set -m && set +m) || exit 77'],
diff --git a/tests/local.at b/tests/local.at
index 9beea3a..8a81835 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -50,8 +50,8 @@ AT_CHECK([$at_diff "$1" "$2"])
 # If the shell handles `-n' well, use it to check the syntax of PROGRAM;
 # otherwise, do nothing.
 m4_define([AT_CHECK_SHELL_SYNTAX],
-[AS_IF([test "$ac_cv_sh_n_works" = yes],
-  [AT_CHECK([/bin/sh -n $1])])])
+[AT_SKIP_IF([test "$ac_cv_sh_n_works" != yes])
+AT_CHECK([/bin/sh -n $1])])
 
 m4_define([AT_CHECK_PERL_SYNTAX],
 [AT_CHECK([autom4te_perllibdir=$abs_top_srcdir/lib $PERL -c 
"$abs_top_builddir"/bin/$1],


hooks/post-receive
-- 
GNU Autoconf source repository
reply via email to
[Prev in Thread] Current Thread [Next in Thread]