Changeset 2517


Ignore:
Timestamp:
Jul 11, 2011, 3:58:16 PM (10 years ago)
Author:
Peter
Message:

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

Location:
trunk
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r2487 r2517  
    100100AC_SUBST(have_doxygen)
    101101AM_CONDITIONAL([DX_ENABLE_HTML], [test x$have_doxygen = xyes])
    102 AC_CONFIG_FILES([test/documentation_test.sh],
    103                 [chmod +x test/documentation_test.sh])
    104102
    105103# check for quiet_NaN support in OS
  • trunk/test/Makefile.am

    r2510 r2517  
    6767XFAIL_TESTS =
    6868
    69 TESTS += documentation_test.sh
    70 
    7169DISTRIBUTED_TESTS = \
     70doxygen_test.sh \
    7271help_test.sh \
    7372static_test.sh \
     
    117116yat_msg_error_test2.log:$(top_srcdir)/m4/yat_msg_error.m4 common_defs.sh
    118117
    119 ## We always rerun documentation_test. When sources for doxygen have
     118## We always rerun doxygen_test. When sources for doxygen have
    120119## not changed and a rerun would not be needed, the test is very
    121120## inexpensive because 'make doc' will not run anything, in other
    122121## words, we always run the test but let the logic for 'make doc' take
    123122## care of whether doxygen will run or not.
    124 documentation_test.log: FORCE
     123doxygen_test.log: FORCE
    125124
    126125
  • trunk/test/common_defs.sh.in

    r2458 r2517  
    105105abs_top_srcdir=@abs_top_srcdir@
    106106move_if_change=@abs_top_srcdir@/build_support/move-if-change
     107have_doxygen="@have_doxygen@"
     108
     109# user is always right
     110test -z "$DOXYGEN" && DOXYGEN="@DOXYGEN@"
    107111
    108112rm -rf $test_dir
  • trunk/test/doxygen_test.sh

    r2516 r2517  
    1 #!@SHELL@
    2 # @configure_input@
     1#!/bin/sh
    32
    43# $Id$
     
    2322#
    2423
    25 have_doxygen="@have_doxygen@"
     24required=doxygen
     25. ./common_defs.sh || exit 1
    2626
    2727if test $have_doxygen = "no"; then
     
    3030fi
    3131
    32 echo @ECHO_N@ "doxygen "
    33 @DOXYGEN@ --version
    34 (cd @abs_top_builddir@/doc && make doc < /dev/null) || exit 1
    35 if test ! -e @abs_top_builddir@/doc/doxygen.error; then
    36     echo Cannot find file: @abs_top_builddir@/doc/doxygen.error
     32printf "doxygen "
     33$DOXYGEN --version
     34(cd $abs_top_builddir/doc && make doc < /dev/null) || exit 1
     35if test ! -e $abs_top_builddir/doc/doxygen.error; then
     36    echo Cannot find file: $abs_top_builddir/doc/doxygen.error
    3737    exit 1;
    3838fi
    39 if test -s @abs_top_builddir@/doc/doxygen.error; then
     39if test -s $abs_top_builddir/doc/doxygen.error; then
    4040
    41     cat @abs_top_builddir@/doc/doxygen.error
     41    cat $abs_top_builddir/doc/doxygen.error
    4242    exit 1;
    4343fi
Note: See TracChangeset for help on using the changeset viewer.