am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / am-missing-prog.sh

diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
old mode 100755 (executable)
new mode 100644 (file)
index 6368db5..e30666e
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
@@ -16,7 +16,7 @@
 
 # Test AM_MISSING_PROG.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AM_MISSING_PROG([NO_SUCH_COMMAND],    [am-none-none])
@@ -51,13 +51,11 @@ o = $@-stdout
 e = $@-stderr
 
 debug_info = grep . $@-stdout $@-stderr
-status_is = $(debug_info); echo $@: st=$$st; : test $$st -eq
+status_is = $(debug_info); echo $@: st=$$st; test $$st -eq
 
 w_mis = 'am-none-none' is needed, and is missing on your system
 w_old = 'am-exit-63' is needed, and is probably too old
 
-# FIXME: make this test stricter w.r.t. the exit statuses once
-# FIXME: we are merged to master!
 test1:
        st=0; $(NO_SUCH_COMMAND) >$o 2>$e || st=$$?; $(status_is) 127
         grep "^WARNING: $(w_mis)" $e