From db353c2c695386e32bd065ff1a99a7e761d64612 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Thu, 25 Jan 2001 04:09:22 +0000 Subject: [PATCH] *.cc: Remove explicit reference to 'testsuite/' in testcases. * testsuite/27_io/*.cc: Remove explicit reference to 'testsuite/' in testcases. Prepare for the DejaGnu based framework. * mkcheck.in: Adjust call to tests_flags. Don't mmkdir testsuite directory -- it is now mkcheck working directory. * tests_flags.in: Remove reference to $(top_srcdir). Use ${SRC_DIR} instead. * Makefile.am (check, check-install): Change mkcheck invocation logic. * Makefile.in: Regenerate. From-SVN: r39255 --- libstdc++-v3/ChangeLog | 12 ++++++++++++ libstdc++-v3/Makefile.am | 18 +++++++++++------- libstdc++-v3/Makefile.in | 17 +++++++++++------ libstdc++-v3/mkcheck.in | 12 +++++------- libstdc++-v3/tests_flags.in | 3 +-- libstdc++-v3/testsuite/27_io/filebuf.cc | 9 ++++++--- .../testsuite/27_io/filebuf_members.cc | 6 ++++-- .../testsuite/27_io/ifstream_members.cc | 6 ++++-- .../testsuite/27_io/ios_base_members_static.cc | 4 +++- .../testsuite/27_io/istream_extractor_other.cc | 6 ++++-- libstdc++-v3/testsuite/27_io/istream_seeks.cc | 8 ++++---- .../testsuite/27_io/istream_unformatted.cc | 4 +++- .../testsuite/27_io/ofstream_members.cc | 6 ++++-- .../testsuite/27_io/ostream_inserter_char.cc | 2 +- .../testsuite/27_io/ostream_inserter_other.cc | 14 ++++++++------ libstdc++-v3/testsuite/27_io/ostream_seeks.cc | 8 ++++---- 16 files changed, 85 insertions(+), 50 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fdd1cff4566..cdd518c4e46 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2001-01-25 Gabriel Dos Reis + + * testsuite/27_io/*.cc: Remove explicit reference to 'testsuite/' + in testcases. Prepare for the DejaGnu based framework. + * mkcheck.in: Adjust call to tests_flags. Don't mmkdir testsuite + directory -- it is now mkcheck working directory. + * tests_flags.in: Remove reference to $(top_srcdir). Use + ${SRC_DIR} instead. + * Makefile.am (check, check-install): Change mkcheck invocation + logic. + * Makefile.in: Regenerate. + 2001-01-24 Mark Mitchell * config/os/aix/bits/atomicity.h (__compare_and_swap): Remove. diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 0c5c09f2b54..aab3dc155b3 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -26,17 +26,21 @@ MAINT_CHARSET = latin1 SUBDIRS = libio libmath libsupc++ src - -# Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck" +# Use $${builddir} instead of $(top_builddir) for arguments to "mkcheck" # because then the paths will be full pathnames, not relative # pathnames. (-Wl,--rpath seems to like this better.) -check: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck - $(top_builddir)/mkcheck 0 `pwd` $(top_srcdir) +check: $(top_builddir)/mkcheck + -(chmod + $(top_builddir)/mkcheck; \ + srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \ + test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ + cd testsuite; $${builddir}/mkcheck 0 $${builddir} $${srcdir}) check-install: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck - $(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix) + -(chmod + $(top_builddir)/mkcheck; \ + srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \ + test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ + cd testsuite; \ + $${builddir}/mkcheck 1 $${builddir} $${srcdir} $(prefix)) # Multilib support. MAKEOVERRIDES= diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 8402499facc..9a45cacc882 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -410,16 +410,21 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -# Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck" +# Use $${builddir} instead of $(top_builddir) for arguments to "mkcheck" # because then the paths will be full pathnames, not relative # pathnames. (-Wl,--rpath seems to like this better.) -check: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck - $(top_builddir)/mkcheck 0 `pwd` $(top_srcdir) +check: $(top_builddir)/mkcheck + -(chmod + $(top_builddir)/mkcheck; \ + srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \ + test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ + cd testsuite; $${builddir}/mkcheck 0 $${builddir} $${srcdir}) check-install: $(top_builddir)/mkcheck - chmod +x $(top_builddir)/mkcheck - $(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix) + -(chmod + $(top_builddir)/mkcheck; \ + srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \ + test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ + cd testsuite; \ + $${builddir}/mkcheck 1 $${builddir} $${srcdir} $(prefix)) # Multilib Makefile bits. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index 6b5ae31cc08..7eb30e014c8 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -52,7 +52,7 @@ esac # Compute the flags necessary to run the testsuite. saved_ifs=$IFS IFS=':' -set `./tests_flags ${query} $*` || exit 1 +set `../tests_flags ${query} $*` || exit 1 BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; CXX=$4; CXXFLAGS=$5; INCLUDES=$6; LIBS=$7; IFS=$saved_ifs @@ -74,12 +74,10 @@ ST_FLAG="-static" # Set up the testing directory, which should be in a directory called # "testsuite" in the root level of the build directory. -TEST_DIR="`pwd`/testsuite" -if [ ! -d "$TEST_DIR" ]; then - echo "making directory $TEST_DIR" - mkdir $TEST_DIR - mkdir $TEST_DIR/.libs # help libtool keep quiet - chmod u+w $TEST_DIR +TEST_DIR='.' +# help libtool keep quiet +if [ ! -d ${TEST_DIR}/.libs ]; then + mkdir $TEST_DIR/.libs fi # the name of the file that will collect and hold all this useful data: diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in index b82fe567c05..c012cbb097f 100644 --- a/libstdc++-v3/tests_flags.in +++ b/libstdc++-v3/tests_flags.in @@ -98,7 +98,6 @@ esac # Compute include paths # INCLUDES == include path to new headers for use on gcc command-line -top_srcdir=@top_srcdir@ C_DIR="`basename @C_INCLUDE_DIR@`" case ${query} in --installed-library) @@ -121,7 +120,7 @@ case ${query} in esac # For built or installed libraries, we need to get right OS-specific bits. -. ${top_srcdir}/configure.target +. ${SRC_DIR}/configure.target # LIB_PATH == where to find the build libraries for libtool's use # CXX == the full pathname of the compiler diff --git a/libstdc++-v3/testsuite/27_io/filebuf.cc b/libstdc++-v3/testsuite/27_io/filebuf.cc index bba2fbd6034..4cfd9277b57 100644 --- a/libstdc++-v3/testsuite/27_io/filebuf.cc +++ b/libstdc++-v3/testsuite/27_io/filebuf.cc @@ -22,14 +22,17 @@ // buffer_size length of 8092, so that overflow/underflow can be // simulated a bit more readily. +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %*.txt + #include #include const char carray_01[] = "santa cruz or sandiego?"; const char carray_02[] = "memphis, new orleans, and savanah"; -const char name_01[] = "testsuite/filebuf-1.txt"; // file with data in it -const char name_02[] = "testsuite/filebuf-2.txt"; // empty file, need to create -const char name_03[] = "testsuite/filebuf-3.txt"; // empty file, need to create +const char name_01[] = "filebuf-1.txt"; // file with data in it +const char name_02[] = "filebuf-2.txt"; // empty file, need to create +const char name_03[] = "filebuf-3.txt"; // empty file, need to create class derived_filebuf: public std::filebuf { diff --git a/libstdc++-v3/testsuite/27_io/filebuf_members.cc b/libstdc++-v3/testsuite/27_io/filebuf_members.cc index beaf6da6600..3b028a5221a 100644 --- a/libstdc++-v3/testsuite/27_io/filebuf_members.cc +++ b/libstdc++-v3/testsuite/27_io/filebuf_members.cc @@ -17,6 +17,8 @@ // USA. // 27.8.1.3 filebuf member functions +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %-*.txt // various tests for filebuf::open() and filebuf::close() including // the non-portable functionality in the libstdc++-v3 IO library @@ -37,8 +39,8 @@ // thanks to "George T. Talbot" for uncovering // this bug/situation. -const char name_01[] = "testsuite/filebuf_members-1.tst"; -const char name_02[] = "testsuite/filebuf_members-1.txt"; +const char name_01[] = "filebuf_members-1.tst"; +const char name_02[] = "filebuf_members-1.txt"; int test_01() diff --git a/libstdc++-v3/testsuite/27_io/ifstream_members.cc b/libstdc++-v3/testsuite/27_io/ifstream_members.cc index e87aa76016a..3fb7a6d1156 100644 --- a/libstdc++-v3/testsuite/27_io/ifstream_members.cc +++ b/libstdc++-v3/testsuite/27_io/ifstream_members.cc @@ -17,13 +17,15 @@ // USA. // 27.8.1.7 ifstream member functions +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %-*.txt #include #include #include -const char name_01[] = "testsuite/ifstream_members-1.tst"; -const char name_02[] = "testsuite/ifstream_members-1.txt"; +const char name_01[] = "ifstream_members-1.tst"; +const char name_02[] = "ifstream_members-1.txt"; // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html bool test00() diff --git a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc index 6a0e82684b4..08043449bdc 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc @@ -21,6 +21,8 @@ // USA. // 27.4.2.4 ios_base static members +// @require@ %-*.tst +// @diff@ %-*.tst %-*.txt #include #include @@ -58,7 +60,7 @@ test02() { std::ios_base::sync_with_stdio(); - std::freopen("testsuite/ios_base_members_static-1.txt", "w", stdout); + std::freopen("ios_base_members_static-1.txt", "w", stdout); for (int i = 0; i < 2; i++) { diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc index 72633af6ddd..2bd878fabce 100644 --- a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc @@ -19,6 +19,8 @@ // USA. // 27.6.1.2.3 basic_istream::operator>> +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %-*.txt #include #include @@ -154,8 +156,8 @@ bool test02() { bool test = true; typedef std::ios::traits_type ctraits_type; - const char name_01[] = "testsuite/istream_extractor_other-1.txt"; //read - const char name_02[] = "testsuite/istream_extractor_other-2.txt"; //write + const char name_01[] = "istream_extractor_other-1.txt"; //read + const char name_02[] = "istream_extractor_other-2.txt"; //write std::filebuf fbin, fbout; fbin.open(name_01, std::ios_base::in); diff --git a/libstdc++-v3/testsuite/27_io/istream_seeks.cc b/libstdc++-v3/testsuite/27_io/istream_seeks.cc index cc2626dfcd1..d5fad458af0 100644 --- a/libstdc++-v3/testsuite/27_io/istream_seeks.cc +++ b/libstdc++-v3/testsuite/27_io/istream_seeks.cc @@ -33,7 +33,7 @@ bool test01() typedef ios::pos_type pos_type; bool test = true; - const char str_lit01[] = "testsuite/istream_unformatted-1.tst"; + const char str_lit01[] = "istream_unformatted-1.tst"; // in // test default ctors leave things in the same positions... @@ -68,8 +68,8 @@ void test04(void) bool test = true; std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06; std::ios_base::iostate state01, state02; - const char str_lit01[] = "testsuite/istream_unformatted-1.txt"; - const char str_lit02[] = "testsuite/istream_unformatted-2.txt"; + const char str_lit01[] = "istream_unformatted-1.txt"; + const char str_lit02[] = "istream_unformatted-2.txt"; std::ifstream if01(str_lit01, std::ios_base::in | std::ios_base::out); std::ifstream if02(str_lit01, std::ios_base::in); std::ifstream if03(str_lit02, std::ios_base::out | std::ios_base::trunc); @@ -174,7 +174,7 @@ void test05(void) bool test = true; std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06; std::ios_base::iostate state01, state02; - const char str_lit01[] = "testsuite/istream_unformatted-1.tst"; + const char str_lit01[] = "istream_unformatted-1.tst"; std::ifstream if01(str_lit01); std::ifstream if02(str_lit01); std::ifstream if03(str_lit01); diff --git a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc index 76464d73ffa..77560a59095 100644 --- a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc +++ b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc @@ -19,6 +19,8 @@ // USA. // 27.6.1.3 unformatted input functions +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %-*.txt #include // for strncmp,... #include @@ -459,7 +461,7 @@ int test07() { bool test = true; - const char* tfn = "testsuite/istream_unformatted-3.txt"; + const char* tfn = "istream_unformatted-3.txt"; std::ifstream infile; infile.open(tfn); VERIFY( !(!infile) ); diff --git a/libstdc++-v3/testsuite/27_io/ofstream_members.cc b/libstdc++-v3/testsuite/27_io/ofstream_members.cc index 4a20d2f5751..d965b3efbfc 100644 --- a/libstdc++-v3/testsuite/27_io/ofstream_members.cc +++ b/libstdc++-v3/testsuite/27_io/ofstream_members.cc @@ -17,13 +17,15 @@ // USA. // 27.8.1.10 ofstream member functions +// @require@ %-*.tst +// @diff@ %-*.tst %-*.txt #include #include #include -const char name_01[] = "testsuite/ofstream_members-1.tst"; -const char name_02[] = "testsuite/ofstream_members-1.txt"; +const char name_01[] = "ofstream_members-1.tst"; +const char name_02[] = "ofstream_members-1.txt"; // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html bool test00() diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc index 59a1bd27e74..0c7f18915fc 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc @@ -32,7 +32,7 @@ bool test01() bool test = true; std::string str01; const int size = 1000; - const char name_02[] = "testsuite/ostream_inserter_char-1.txt"; + const char name_02[] = "ostream_inserter_char-1.txt"; // initialize string for(int i=0 ; i < size; i++) { diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc index 465890e2109..ec3a028e82f 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc @@ -20,6 +20,8 @@ // USA. // 27.6.2.5.4 basic_ostream character inserters +// @require@ %-*.tst %-*.txt +// @diff@ %-*.tst %-*.txt #include #include @@ -27,10 +29,10 @@ #include const int size = 1000; -const char name_01[] = "testsuite/ostream_inserter_other-1.tst"; -const char name_02[] = "testsuite/ostream_inserter_other-1.txt"; -const char name_03[] = "testsuite/ostream_inserter_other-2.tst"; -const char name_04[] = "testsuite/ostream_inserter_other-2.txt"; +const char name_01[] = "ostream_inserter_other-1.tst"; +const char name_02[] = "ostream_inserter_other-1.txt"; +const char name_03[] = "ostream_inserter_other-2.tst"; +const char name_04[] = "ostream_inserter_other-2.txt"; // stringstream @@ -101,8 +103,8 @@ test03(void) typedef ios::pos_type pos_type; - const char* TEST_IN = "testsuite/ostream_inserter_other_in"; - const char* TEST_OUT = "testsuite/ostream_inserter_other_out"; + const char* TEST_IN = "ostream_inserter_other_in"; + const char* TEST_OUT = "ostream_inserter_other_out"; pos_type i_read, i_wrote, rs, ws; double tf_size = BUFSIZ * 2.5; ofstream testfile(TEST_IN); diff --git a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc index 0d66754f9d2..df927562a2b 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc @@ -32,7 +32,7 @@ bool test01() typedef ios::pos_type pos_type; bool test = true; - const char str_lit01[] = "testsuite/ostream_seeks-1.txt"; + const char str_lit01[] = "ostream_seeks-1.txt"; // out // test default ctors leave things in the same positions... @@ -72,8 +72,8 @@ void test04(void) bool test = true; std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06; std::ios_base::iostate state01, state02; - const char str_lit01[] = "testsuite/istream_unformatted-1.txt"; - const char str_lit02[] = "testsuite/istream_unformatted-2.txt"; + const char str_lit01[] = "istream_unformatted-1.txt"; + const char str_lit02[] = "istream_unformatted-2.txt"; std::ifstream if01(str_lit01, std::ios_base::in | std::ios_base::out); std::ifstream if02(str_lit01, std::ios_base::in); std::ifstream if03(str_lit02, std::ios_base::out | std::ios_base::trunc); @@ -178,7 +178,7 @@ void test05(void) bool test = true; std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06; std::ios_base::iostate state01, state02; - const char str_lit01[] = "testsuite/istream_unformatted-1.tst"; + const char str_lit01[] = "istream_unformatted-1.tst"; std::ifstream if01(str_lit01); std::ifstream if02(str_lit01); std::ifstream if03(str_lit01); -- 2.30.2