Changeset 2517

Timestamp:

Jul 11, 2011, 3:58:16 PM (12 years ago)

Author:

Peter

Message:

use common_defs in documentation_test. Change name to doxygen_test to avoid filename conflict

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/common_defs.sh.in (modified) (1 diff)
• test/doxygen_test.sh (moved) (moved from trunk/test/documentation_test.sh.in) (3 diffs)

trunk/configure.ac

@@ -100 +100 @@
 AC_SUBST(have_doxygen)
 AM_CONDITIONAL([DX_ENABLE_HTML], [test x$have_doxygen = xyes])
-AC_CONFIG_FILES([test/documentation_test.sh], 
-                [chmod +x test/documentation_test.sh])
 
 # check for quiet_NaN support in OS

trunk/test/Makefile.am

@@ -67 +67 @@
 XFAIL_TESTS =
 
-TESTS += documentation_test.sh
-
 DISTRIBUTED_TESTS = \
+doxygen_test.sh \
 help_test.sh \
 static_test.sh \
@@ -117 +116 @@
 yat_msg_error_test2.log:$(top_srcdir)/m4/yat_msg_error.m4 common_defs.sh 
 
-## We always rerun documentation_test. When sources for doxygen have
+## We always rerun doxygen_test. When sources for doxygen have
 ## not changed and a rerun would not be needed, the test is very
 ## inexpensive because 'make doc' will not run anything, in other
 ## words, we always run the test but let the logic for 'make doc' take
 ## care of whether doxygen will run or not.
-documentation_test.log: FORCE
+doxygen_test.log: FORCE
 
 

trunk/test/common_defs.sh.in

@@ -105 +105 @@
 abs_top_srcdir=@abs_top_srcdir@
 move_if_change=@abs_top_srcdir@/build_support/move-if-change
+have_doxygen="@have_doxygen@"
+
+# user is always right
+test -z "$DOXYGEN" && DOXYGEN="@DOXYGEN@"
 
 rm -rf $test_dir

trunk/test/doxygen_test.sh

@@ -1 @@
-#!@SHELL@
-# @configure_input@
+#!/bin/sh
 
 # $Id$
@@ -23 +22 @@
 #
 
-have_doxygen="@have_doxygen@"
+required=doxygen
+. ./common_defs.sh || exit 1
 
 if test $have_doxygen = "no"; then
@@ -30 +30 @@
 fi
 
-echo @ECHO_N@ "doxygen "
-@DOXYGEN@ --version
-(cd @abs_top_builddir@/doc && make doc < /dev/null) || exit 1
-if test ! -e @abs_top_builddir@/doc/doxygen.error; then
-    echo Cannot find file: @abs_top_builddir@/doc/doxygen.error
+printf "doxygen "
+$DOXYGEN --version
+(cd $abs_top_builddir/doc && make doc < /dev/null) || exit 1
+if test ! -e $abs_top_builddir/doc/doxygen.error; then
+    echo Cannot find file: $abs_top_builddir/doc/doxygen.error
     exit 1;
 fi
-if test -s @abs_top_builddir@/doc/doxygen.error; then
+if test -s $abs_top_builddir/doc/doxygen.error; then
 
-    cat @abs_top_builddir@/doc/doxygen.error
+    cat $abs_top_builddir/doc/doxygen.error
     exit 1;
 fi