This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

V3 PATCH: Prepare V3 testsuite for DejaGnu-based framework



This patch prepares V3 for DejaGnu based framework.

Tested on i686-pc-linux-gnu.

-- Gaby
CodeSourcery, LLC                       http://www.codesourcery.com


2001-01-25  Gabriel Dos Reis  <gdr@codesourcery.com>

	* 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.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/Makefile.am,v
retrieving revision 1.15
diff -p -r1.15 Makefile.am
*** Makefile.am	2000/10/17 08:25:07	1.15
--- Makefile.am	2001/01/25 03:56:49
*************** MAINT_CHARSET = latin1
*** 26,42 ****
  
  SUBDIRS = libio libmath libsupc++ src
  
! 
! # Use $(blddir) 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-install: $(top_builddir)/mkcheck
! 	chmod +x  $(top_builddir)/mkcheck
! 	$(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix)
  
  # Multilib support.
  MAKEOVERRIDES=
--- 26,46 ----
  
  SUBDIRS = libio libmath libsupc++ src
  
! # 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 + $(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 + $(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=
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/Makefile.in,v
retrieving revision 1.54
diff -p -r1.54 Makefile.in
*** Makefile.in	2000/12/23 07:13:55	1.54
--- Makefile.in	2001/01/25 03:56:49
*************** distclean-generic clean-generic maintain
*** 410,425 ****
  mostlyclean distclean maintainer-clean
  
  
! # Use $(blddir) 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-install: $(top_builddir)/mkcheck
! 	chmod +x  $(top_builddir)/mkcheck
! 	$(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix)
  
  # Multilib Makefile bits.
  .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
--- 410,430 ----
  mostlyclean distclean maintainer-clean
  
  
! # 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 + $(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 + $(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 \
Index: tests_flags.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/tests_flags.in,v
retrieving revision 1.9
diff -p -r1.9 tests_flags.in
*** tests_flags.in	2001/01/20 00:55:09	1.9
--- tests_flags.in	2001/01/25 03:56:49
*************** esac
*** 98,104 ****
  
  # 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)
--- 98,103 ----
*************** case ${query} in
*** 121,127 ****
  esac
  
  # For built or installed libraries, we need to get right OS-specific bits.
! . ${top_srcdir}/configure.target
  
  # LIB_PATH == where to find the build libraries for libtool's use
  # CXX == the full pathname of the compiler
--- 120,126 ----
  esac
  
  # For built or installed libraries, we need to get right OS-specific bits.
! . ${SRC_DIR}/configure.target
  
  # LIB_PATH == where to find the build libraries for libtool's use
  # CXX == the full pathname of the compiler
Index: mkcheck.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/mkcheck.in,v
retrieving revision 1.47
diff -p -r1.47 mkcheck.in
*** mkcheck.in	2001/01/20 00:55:09	1.47
--- mkcheck.in	2001/01/25 03:56:49
*************** esac
*** 52,58 ****
  # Compute the flags necessary to run the testsuite.
  saved_ifs=$IFS
  IFS=':'
! 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
  
--- 52,58 ----
  # Compute the flags necessary to run the testsuite.
  saved_ifs=$IFS
  IFS=':'
! 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
  
*************** ST_FLAG="-static"
*** 74,85 ****
  
  # 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
  fi
  
  # the name of the file that will collect and hold all this useful data:
--- 74,83 ----
  
  # Set up the testing directory, which should be in a directory called
  # "testsuite" in the root level of the build directory.
! 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:
Index: testsuite/27_io/filebuf.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/filebuf.cc,v
retrieving revision 1.7
diff -p -r1.7 filebuf.cc
*** filebuf.cc	2000/08/14 19:59:25	1.7
--- filebuf.cc	2001/01/25 03:56:49
***************
*** 22,35 ****
  // buffer_size length of 8092, so that overflow/underflow can be
  // simulated a bit more readily.
  
  #include <fstream>
  #include <debug_assert.h>
  
  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
  
  class derived_filebuf: public std::filebuf
  {
--- 22,38 ----
  // buffer_size length of 8092, so that overflow/underflow can be
  // simulated a bit more readily.
  
+ // @require@ %-*.tst %-*.txt
+ // @diff@ %-*.tst %*.txt
+ 
  #include <fstream>
  #include <debug_assert.h>
  
  const char carray_01[] = "santa cruz or sandiego?";
  const char carray_02[] = "memphis, new orleans, and savanah";
! 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
  {
Index: testsuite/27_io/filebuf_members.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/filebuf_members.cc,v
retrieving revision 1.4
diff -p -r1.4 filebuf_members.cc
*** filebuf_members.cc	2000/08/14 19:59:25	1.4
--- filebuf_members.cc	2001/01/25 03:56:49
***************
*** 17,22 ****
--- 17,24 ----
  // 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,44 ****
  // thanks to "George T. Talbot" <george@moberg.com> for uncovering
  // this bug/situation. 
  
! const char name_01[] = "testsuite/filebuf_members-1.tst";
! const char name_02[] = "testsuite/filebuf_members-1.txt";
  
  int
  test_01()
--- 39,46 ----
  // thanks to "George T. Talbot" <george@moberg.com> for uncovering
  // this bug/situation. 
  
! const char name_01[] = "filebuf_members-1.tst";
! const char name_02[] = "filebuf_members-1.txt";
  
  int
  test_01()
Index: testsuite/27_io/ifstream_members.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ifstream_members.cc,v
retrieving revision 1.4
diff -p -r1.4 ifstream_members.cc
*** ifstream_members.cc	2000/12/21 22:08:39	1.4
--- ifstream_members.cc	2001/01/25 03:56:49
***************
*** 17,29 ****
  // USA.
  
  // 27.8.1.7 ifstream member functions
  
  #include <istream>
  #include <fstream>
  #include <debug_assert.h>
  
! const char name_01[] = "testsuite/ifstream_members-1.tst";
! const char name_02[] = "testsuite/ifstream_members-1.txt";
  
  // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
  bool test00()
--- 17,31 ----
  // USA.
  
  // 27.8.1.7 ifstream member functions
+ // @require@ %-*.tst %-*.txt
+ // @diff@ %-*.tst %-*.txt
  
  #include <istream>
  #include <fstream>
  #include <debug_assert.h>
  
! 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()
Index: testsuite/27_io/ios_base_members_static.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc,v
retrieving revision 1.3
diff -p -r1.3 ios_base_members_static.cc
*** ios_base_members_static.cc	2001/01/18 07:23:04	1.3
--- ios_base_members_static.cc	2001/01/25 03:56:49
***************
*** 21,26 ****
--- 21,28 ----
  // USA.
  
  // 27.4.2.4 ios_base static members
+ // @require@ %-*.tst
+ // @diff@ %-*.tst %-*.txt
  
  #include <cstdio>
  #include <sstream>
*************** test02()
*** 58,64 ****
  {
    std::ios_base::sync_with_stdio();
   
!   std::freopen("testsuite/ios_base_members_static-1.txt", "w", stdout);
   
    for (int i = 0; i < 2; i++)
      {
--- 60,66 ----
  {
    std::ios_base::sync_with_stdio();
   
!   std::freopen("ios_base_members_static-1.txt", "w", stdout);
   
    for (int i = 0; i < 2; i++)
      {
Index: testsuite/27_io/istream_extractor_other.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc,v
retrieving revision 1.2
diff -p -r1.2 istream_extractor_other.cc
*** istream_extractor_other.cc	2000/08/14 19:59:25	1.2
--- istream_extractor_other.cc	2001/01/25 03:56:49
***************
*** 19,24 ****
--- 19,26 ----
  // USA.
  
  // 27.6.1.2.3 basic_istream::operator>>
+ // @require@ %-*.tst %-*.txt
+ // @diff@ %-*.tst %-*.txt
  
  #include <istream>
  #include <sstream>
*************** bool test02() {
*** 154,161 ****
  
    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
  
    std::filebuf fbin, fbout;
    fbin.open(name_01, std::ios_base::in);
--- 156,163 ----
  
    bool test = true;
    typedef std::ios::traits_type ctraits_type;
!   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);
Index: testsuite/27_io/istream_seeks.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/istream_seeks.cc,v
retrieving revision 1.3
diff -p -r1.3 istream_seeks.cc
*** istream_seeks.cc	2000/10/18 02:07:54	1.3
--- istream_seeks.cc	2001/01/25 03:56:49
*************** bool test01()
*** 33,39 ****
    typedef ios::pos_type pos_type;
  
    bool test = true;
!   const char str_lit01[] = "testsuite/istream_unformatted-1.tst";
  
    // in
    // test default ctors leave things in the same positions...
--- 33,39 ----
    typedef ios::pos_type pos_type;
  
    bool test = true;
!   const char str_lit01[] = "istream_unformatted-1.tst";
  
    // in
    // test default ctors leave things in the same positions...
*************** void test04(void)
*** 68,75 ****
    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";
    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); 
--- 68,75 ----
    bool test = true;
    std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
    std::ios_base::iostate state01, state02;
!   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); 
*************** void test05(void)
*** 174,180 ****
    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";
    std::ifstream if01(str_lit01);
    std::ifstream if02(str_lit01);
    std::ifstream if03(str_lit01);
--- 174,180 ----
    bool test = true;
    std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
    std::ios_base::iostate state01, state02;
!   const char str_lit01[] = "istream_unformatted-1.tst";
    std::ifstream if01(str_lit01);
    std::ifstream if02(str_lit01);
    std::ifstream if03(str_lit01);
Index: testsuite/27_io/istream_unformatted.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/istream_unformatted.cc,v
retrieving revision 1.10
diff -p -r1.10 istream_unformatted.cc
*** istream_unformatted.cc	2001/01/16 07:55:26	1.10
--- istream_unformatted.cc	2001/01/25 03:56:49
***************
*** 19,24 ****
--- 19,26 ----
  // USA.
  
  // 27.6.1.3 unformatted input functions
+ // @require@ %-*.tst %-*.txt
+ // @diff@ %-*.tst %-*.txt
  
  #include <cstring> // for strncmp,...
  #include <istream>
*************** int
*** 459,465 ****
  test07()
  {
    bool test = true;
!   const char* tfn = "testsuite/istream_unformatted-3.txt";
    std::ifstream infile;
    infile.open(tfn);
    VERIFY( !(!infile) );
--- 461,467 ----
  test07()
  {
    bool test = true;
!   const char* tfn = "istream_unformatted-3.txt";
    std::ifstream infile;
    infile.open(tfn);
    VERIFY( !(!infile) );
Index: testsuite/27_io/ofstream_members.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ofstream_members.cc,v
retrieving revision 1.4
diff -p -r1.4 ofstream_members.cc
*** ofstream_members.cc	2000/12/21 22:08:39	1.4
--- ofstream_members.cc	2001/01/25 03:56:49
***************
*** 17,29 ****
  // USA.
  
  // 27.8.1.10 ofstream member functions
  
  #include <ostream>
  #include <fstream>
  #include <debug_assert.h>
  
! const char name_01[] = "testsuite/ofstream_members-1.tst";
! const char name_02[] = "testsuite/ofstream_members-1.txt";
  
  // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
  bool test00()
--- 17,31 ----
  // USA.
  
  // 27.8.1.10 ofstream member functions
+ // @require@ %-*.tst
+ // @diff@ %-*.tst %-*.txt
  
  #include <ostream>
  #include <fstream>
  #include <debug_assert.h>
  
! 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()
Index: testsuite/27_io/ostream_inserter_char.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc,v
retrieving revision 1.3
diff -p -r1.3 ostream_inserter_char.cc
*** ostream_inserter_char.cc	2000/12/21 22:08:39	1.3
--- ostream_inserter_char.cc	2001/01/25 03:56:49
*************** bool test01()
*** 32,38 ****
    bool test = true;
    std::string str01;
    const int size = 1000;
!   const char name_02[] = "testsuite/ostream_inserter_char-1.txt";
  
    // initialize string
    for(int i=0 ; i < size; i++) {
--- 32,38 ----
    bool test = true;
    std::string str01;
    const int size = 1000;
!   const char name_02[] = "ostream_inserter_char-1.txt";
  
    // initialize string
    for(int i=0 ; i < size; i++) {
Index: testsuite/27_io/ostream_inserter_other.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc,v
retrieving revision 1.5
diff -p -r1.5 ostream_inserter_other.cc
*** ostream_inserter_other.cc	2000/12/21 22:08:39	1.5
--- ostream_inserter_other.cc	2001/01/25 03:56:49
***************
*** 20,25 ****
--- 20,27 ----
  // USA.
  
  // 27.6.2.5.4 basic_ostream character inserters
+ // @require@ %-*.tst %-*.txt
+ // @diff@ %-*.tst %-*.txt
  
  #include <ostream>
  #include <sstream>
***************
*** 27,36 ****
  #include <debug_assert.h>
  
  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";
  
  
  // stringstream
--- 29,38 ----
  #include <debug_assert.h>
  
  const int size = 1000;
! 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
*************** test03(void)
*** 101,108 ****
  
    typedef ios::pos_type 	pos_type;
  
!   const char* TEST_IN = "testsuite/ostream_inserter_other_in";
!   const char* TEST_OUT = "testsuite/ostream_inserter_other_out";
    pos_type i_read, i_wrote, rs, ws;
    double tf_size = BUFSIZ * 2.5;
    ofstream testfile(TEST_IN);
--- 103,110 ----
  
    typedef ios::pos_type 	pos_type;
  
!   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);
Index: testsuite/27_io/ostream_seeks.cc
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/testsuite/27_io/ostream_seeks.cc,v
retrieving revision 1.3
diff -p -r1.3 ostream_seeks.cc
*** ostream_seeks.cc	2000/10/18 02:07:54	1.3
--- ostream_seeks.cc	2001/01/25 03:56:50
*************** bool test01()
*** 32,38 ****
    typedef ios::pos_type pos_type;
  
    bool test = true;
!   const char str_lit01[] = "testsuite/ostream_seeks-1.txt";
  
    // out
    // test default ctors leave things in the same positions...
--- 32,38 ----
    typedef ios::pos_type pos_type;
  
    bool test = true;
!   const char str_lit01[] = "ostream_seeks-1.txt";
  
    // out
    // test default ctors leave things in the same positions...
*************** void test04(void)
*** 72,79 ****
    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";
    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); 
--- 72,79 ----
    bool test = true;
    std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
    std::ios_base::iostate state01, state02;
!   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); 
*************** void test05(void)
*** 178,184 ****
    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";
    std::ifstream if01(str_lit01);
    std::ifstream if02(str_lit01);
    std::ifstream if03(str_lit01);
--- 178,184 ----
    bool test = true;
    std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
    std::ios_base::iostate state01, state02;
!   const char str_lit01[] = "istream_unformatted-1.tst";
    std::ifstream if01(str_lit01);
    std::ifstream if02(str_lit01);
    std::ifstream if03(str_lit01);

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]