From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 6 Jul 2002 13:06:16 +0000 (+0000)
Subject: * tests/nobase.test (test-install-exec): Move all the `test -f'
X-Git-Tag: Release-1-6b~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c029f5381172fc6d6a5f14b08a07745f231535;p=thirdparty%2Fautomake.git

* tests/nobase.test (test-install-exec): Move all the `test -f'
tests in the Makefile so we can use $(EXEEXT) on programs.
Reported by Charles Wilson.
---

diff --git a/ChangeLog b/ChangeLog
index 994177a7a..3d273b363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-06  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* tests/nobase.test (test-install-exec): Move all the `test -f'
+	tests in the Makefile so we can use $(EXEEXT) on programs.
+	Reported by Charles Wilson.
+
 2002-07-06  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* m4/header.m4 (AM_CONFIG_HEADER): New macro.
diff --git a/tests/nobase.test b/tests/nobase.test
index 715793e27..898f9d6af 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -39,6 +39,36 @@ fooexec_LTLIBRARIES = sub/libbase.la
 nobase_fooexec_LTLIBRARIES = sub/libnobase.la
 sub_libbase_la_SOURCES = source2.c
 sub_libnobase_la_SOURCES = source2.c
+
+test-install-data: install-data
+	test   -f inst/foo/sub/nobase.h
+	test ! -f inst/foo/nobase.h
+	test   -f inst/foo/base.h
+	test   -f inst/foo/sub/nobase.dat
+	test ! -f inst/foo/nobase.dat
+	test   -f inst/foo/base.dat
+	test ! -f inst/foo/sub/nobase.sh
+	test ! -f inst/foo/base.sh
+	test ! -f inst/foo/sub/nobase$(EXEEXT)
+	test ! -f inst/foo/base$(EXEEXT)
+	test ! -f inst/foo/sub/libnobase.a
+	test ! -f inst/foo/libbase.a
+	test ! -f inst/foo/sub/libnobase.la
+	test ! -f inst/foo/libbase.la
+
+test-install-exec: install-exec
+	test   -f inst/foo/sub/nobase.sh
+	test ! -f inst/foo/nobase.sh
+	test   -f inst/foo/base.sh
+	test   -f inst/foo/sub/nobase$(EXEEXT)
+	test ! -f inst/foo/nobase$(EXEEXT)
+	test   -f inst/foo/base$(EXEEXT)
+	test   -f inst/foo/sub/libnobase.a
+	test ! -f inst/foo/libnobase.a
+	test   -f inst/foo/libbase.a
+	test   -f inst/foo/sub/libnobase.la
+	test ! -f inst/foo/libnobase.la
+	test   -f inst/foo/libbase.la
 EOF
 
 mkdir sub
@@ -66,43 +96,8 @@ $AUTOMAKE -a
 ./configure --prefix `pwd`/inst
 
 $MAKE
-$MAKE install-data
-
-test   -f inst/foo/sub/nobase.h
-test ! -f inst/foo/nobase.h
-test   -f inst/foo/base.h
-
-test   -f inst/foo/sub/nobase.dat
-test ! -f inst/foo/nobase.dat
-test   -f inst/foo/base.dat
-
-test ! -f inst/foo/sub/nobase.sh
-test ! -f inst/foo/base.sh
-test ! -f inst/foo/sub/nobase
-test ! -f inst/foo/base
-test ! -f inst/foo/sub/libnobase.a
-test ! -f inst/foo/libbase.a
-test ! -f inst/foo/sub/libnobase.la
-test ! -f inst/foo/libbase.la
-
-$MAKE install-exec
-
-test   -f inst/foo/sub/nobase.sh
-test ! -f inst/foo/nobase.sh
-test   -f inst/foo/base.sh
-
-test   -f inst/foo/sub/nobase
-test ! -f inst/foo/nobase
-test   -f inst/foo/base
-
-test   -f inst/foo/sub/libnobase.a
-test ! -f inst/foo/libnobase.a
-test   -f inst/foo/libbase.a
-
-test   -f inst/foo/sub/libnobase.la
-test ! -f inst/foo/libnobase.la
-test   -f inst/foo/libbase.la
-
+$MAKE test-install-data
+$MAKE test-install-exec
 $MAKE uninstall
 
 test `find inst/foo -type f -print | wc -l` = 0