tests: expose automake bug#14560

[platform/upstream/automake.git] / t / self-check-explicit-skips.sh

diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
old mode 100755 (executable)
new mode 100644 (file)
index ffab44d..ba36450
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,37 +19,36 @@
 # an early exit due to some command exiting unexpectedly with status 77.
 
 am_create_testdir=no
-. ./defs || Exit 1
+. test-init.sh
 
 set +e
 
 unset am_explicit_skips stderr_fileno_
-AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
 
 # FIXME: this can be simplified when we improve our runtime checks on the
 # testsuite shell to ensure it supports "VAR=val shell_func" correctly.
 run_dummy_test ()
 {
-  env $2 $AM_TEST_RUNNER_SHELL -c "am_create_testdir=no; . ./defs; $1" \
-                                  dummy.sh
+  env $2 $AM_TEST_RUNNER_SHELL -c "
+    am_create_testdir=no
+   . test-init.sh
+    $1
+  " dummy.sh
 }
 
-run_dummy_test '(exit 77); exit 77'
-test $? -eq 77 || Exit 1
+run_dummy_test 'exit 77'
+test $? -eq 77 || exit 1
 
 run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no
-test $? -eq 77 || Exit 1
+test $? -eq 77 || exit 1
 
-run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes 
-test $? -eq 78 || Exit 1
+run_dummy_test '$PERL -e "exit 77"; true' am_explicit_skips=yes
+test $? -eq 78 || exit 1
 
-run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y
-test $? -eq 78 || Exit 1
+run_dummy_test 'sh -c "exit 77"; exit 0' am_explicit_skips=y
+test $? -eq 78 || exit 1
 
-run_dummy_test 'Exit 77' am_explicit_skips=yes
-test $? -eq 77 || Exit 1
-
-run_dummy_test 'skip_ "foo"' am_explicit_skips=y
-test $? -eq 77 || Exit 1
+run_dummy_test 'skip_ "foo"; :' am_explicit_skips=y
+test $? -eq 77 || exit 1
 
 :