From 306775bc98843414875ead5af117bb5e55ef323f Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 30 Mar 2015 19:05:07 -0500 Subject: [svn-r26670] Remove VPATH and LONE_COLON Tested with h5committest --- configure.ac | 101 --------------------------------------- tools/h5dump/CMakeTestsXML.cmake | 8 ---- tools/h5dump/testh5dumpxml.sh.in | 12 +---- 3 files changed, 1 insertion(+), 120 deletions(-) diff --git a/configure.ac b/configure.ac index 9725de5..27e856a 100644 --- a/configure.ac +++ b/configure.ac @@ -753,79 +753,6 @@ case "X-$RPATH" in esac ## ---------------------------------------------------------------------- -## Sometimes makes think the `.PATH:' appearing before the first rule -## with an action should override the `all' default target. So we have -## to decide what the proper syntax is. -## -AC_MSG_CHECKING([how make searches directories]) -while true; do #for break - ## The most common method is `VPATH=DIR1 DIR2 ...' - cat >maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) - break - fi - - ## The second most common method is like above except with the - ## directories separated by colons. - cat >maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) - break - fi - - ## pmake uses the construct `.PATH: DIR1 DIR2 - cat >maketest </dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - AC_MSG_RESULT([.PATH: DIR1 DIR2 ...]) - break - fi - - ## No way for make to search directories - SEARCH_RULE='## SEARCH DISABLED: ' - SEARCH_SEP=' ' - AC_MSG_RESULT([it doesn't]) - if test ! -f configure; then - AC_MSG_ERROR([${MAKE-make} requires the build and source directories to be the same]) - fi - break -done -rm maketest - -## ---------------------------------------------------------------------- ## pmake will throw an error if variables are undefined in a Makefile. ## These errors can be changed to warnings using the -V flag. ## @@ -1746,32 +1673,6 @@ AC_CHECK_FUNCS([snprintf srandom strdup symlink system]) AC_CHECK_FUNCS([tmpfile asprintf vasprintf vsnprintf waitpid]) ## ---------------------------------------------------------------------- -## Check that a lone colon can be used as an argument -## This is not true on Cray X1, which interprets a lone colon as a -## system command. -## -AC_CACHE_CHECK([if lone colon can be used as an argument], - [hdf5_cv_lone_colon], - [ - echo "int main(int argc, char * argv[]) {return 0;}" > conftest.c - $CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null - echo "./a.out :" > conftest.sh - chmod 700 conftest.sh - - ./conftest.sh 2> conftest.out - rm -f a.out - TEST_OUTPUT=`cat conftest.out` - - if test "X$TEST_OUTPUT" = "X"; then - hdf5_cv_lone_colon=yes - else - hdf5_cv_lone_colon=no - fi - ]) - -AC_SUBST([H5_LONE_COLON]) H5_LONE_COLON="$hdf5_cv_lone_colon" - -## ---------------------------------------------------------------------- ## Check compiler characteristics ## AC_C_CONST @@ -2829,8 +2730,6 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"]) ## The directory search list AC_SUBST([SEARCH]) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' -cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' -SEARCH="$SEARCH_RULE`eval $cmd`" export SEARCH ## Some cleanup stuff diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake index a939d78..0a667c4 100644 --- a/tools/h5dump/CMakeTestsXML.cmake +++ b/tools/h5dump/CMakeTestsXML.cmake @@ -411,14 +411,6 @@ ADD_XML_H5_TEST (tempty-dtd.h5 0 --use-dtd tempty.h5) ADD_XML_H5_TEST (tempty-dtd-2.h5 0 -u tempty.h5) - # The lone colon here confuses some systems (Cray X1). Skip - # it if configure detects that this is a problem. - set (TESTTYPE "TEST") - if (NOT ${H5_LONE_COLON}) - set (TESTTYPE "SKIP") - endif (NOT ${H5_LONE_COLON}) - ADD_XML_SKIP_H5_TEST (tempty-nons.h5 0 ${TESTTYPE} -X : tempty.h5) - ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5) ## Some of these combinations are syntactically correct but diff --git a/tools/h5dump/testh5dumpxml.sh.in b/tools/h5dump/testh5dumpxml.sh.in index 4dad9cd..1efde85 100644 --- a/tools/h5dump/testh5dumpxml.sh.in +++ b/tools/h5dump/testh5dumpxml.sh.in @@ -21,8 +21,6 @@ TESTNAME=h5dumpxml EXIT_SUCCESS=0 EXIT_FAILURE=1 -H5_LONE_COLON="@H5_LONE_COLON@" - DUMPER=h5dump # The tool name DUMPER_BIN=`pwd`/$DUMPER # The path of the tool binary @@ -356,15 +354,7 @@ TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5 TOOLTEST tempty-dtd.h5.xml --xml --use-dtd tempty.h5 TOOLTEST tempty-dtd-2.h5.xml --xml -u tempty.h5 - -# The lone colon here confuses some systems (Cray X1). Skip -# it if configure detects that this is a problem. -if test "X$H5_LONE_COLON" != "Xno"; then - TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5 -else - SKIP tempty-nons.h5.xml --xml -X ":" tempty.h5 -fi - +TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5 TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5 ## Some of these combinations are syntactically correct but -- cgit v0.12