Changeset 1851

Timestamp:

Mar 5, 2009, 1:43:13 PM (14 years ago)

Author:

Peter

Message:

adding test for --with-yat=no. refs #491

Location:

trunk/test

Files:

• Makefile.am (modified) (1 diff)
• common_defs.sh.in (modified) (3 diffs)
• yat_m4_test.sh (modified) (1 diff)
• yat_m4_test2.sh (copied) (copied from trunk/test/yat_m4_test.sh) (2 diffs)

trunk/test/Makefile.am

@@ -67 +67 @@
 
 # tests not passing through yet
-XFAIL_TESTS =
+XFAIL_TESTS = yat_m4_test2.sh
 
 TESTS += documentation_test.sh
 
-DISTRIBUTED_TESTS = yat_m4_test.sh
+DISTRIBUTED_TESTS = yat_m4_test.sh yat_m4_test2.sh
 
 TESTS += $(DISTRIBUTED_TESTS)

trunk/test/common_defs.sh.in

@@ -34 +34 @@
 fi
 
-echo "Running $me"
+echo "=== Running $me ==="
 
 # autotools are required, if not found exit 77 to skipt test
@@ -66 +66 @@
 AC_PROG_CXX
 AC_PROG_LIBTOOL
-YAT_CHECK_VERSION([0.5.99],,
-                  [AC_MSG_ERROR([could not find required version of yat])])
-YAT_CHECK_HEADER(,[AC_MSG_ERROR([could not find yat headers])])
-YAT_LA_FILE=\`\$yat_config --link-libtool\` 
-AC_SUBST(YAT_LA_FILE)
+m4_include(acinclude.m4)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -87 +83 @@
 EOF
 $move_if_change Makefile.am.tmp Makefile.am
+
+echo "dnl a dummy include" > acinclude.m4
 
 echo "Create hello.cc"

trunk/test/yat_m4_test.sh

@@ -27 +27 @@
 . ./common_defs.sh || exit 1
 
+echo "Create acinclude.m4.tmp"
+cat > acinclude.m4.tmp <<EOF
+YAT_CHECK_VERSION([0.5.99],,
+                  [AC_MSG_ERROR([could not find required version of yat])])
+YAT_CHECK_HEADER(,[AC_MSG_ERROR([could not find yat headers])])
+YAT_LA_FILE=\`\$yat_config --link-libtool\` 
+AC_SUBST(YAT_LA_FILE)
+EOF
+$move_if_change acinclude.m4.tmp acinclude.m4
+
 # bootstrapping
-test -f configure || \
-  (autoreconf -sifv && \
-   ./configure --with-yat=$abs_top_builddir/build_support/yat-config) 
+if test -f Makefile; then : else
+  autoreconf -siv
+  ./configure --with-yat=$abs_top_builddir/build_support/yat-config
+fi
 
 # we always wanna relink

trunk/test/yat_m4_test2.sh

@@ -20 +20 @@
 
 
-# build a `hello world' project that uses macro YAT_CHECK_YAT in its
-# configure.ac. Test if the macro works against an uninstalled yat.
+# test that option --with-yat=no works as expected.
 
 set -e
@@ -27 +26 @@
 . ./common_defs.sh || exit 1
 
+cat > acinclude.m4 <<EOF
+YAT_CHECK_YAT([2.7.8],,AC_MSG_ERROR([test failed - see warning above]))
+YAT_FIND_YAT(,[AC_MSG_ERROR([test failed - see warning above])])
+YAT_CHECK_VERSION([1.60.2],,[AC_MSG_ERROR([test failed - see warning above])])
+YAT_CHECK_HEADER(,[AC_MSG_ERROR([test failed - see warning above])])
+YAT_CHECK_LIB(,[AC_MSG_ERROR([test failed - see warning above])])
+EOF
+
 # bootstrapping
-test -f configure || \
-  (autoreconf -sifv && \
-   ./configure --with-yat=$abs_top_builddir/build_support/yat-config) 
-
-# we always wanna relink
-rm -f hello
-make
-echo "running ./hello"
-./hello || exit 1
+autoreconf -siv && ./configure --with-yat=no
 
 echo "Test is OK"