mkcheck.in: Link against local testsuite library.

2002-06-07  Phil Edwards  <pme@gcc.gnu.org>

	* mkcheck.in:  Link against local testsuite library.
	* testsuite/testsuite_hooks.h (__set_testsuite_memlimit):  Move null
	implementation out...
	* testsuite/testsuite_hooks.cc:  ...to here.

From-SVN: r54349

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0384cf3bfc0968948c8aad62d0ab68cf5f67c54d..2f7993b663b86b24072b3d1e4d0a7bfe60f84629 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-07  Phil Edwards  <pme@gcc.gnu.org>
+
+       * mkcheck.in:  Link against local testsuite library.
+       * testsuite/testsuite_hooks.h (__set_testsuite_memlimit):  Move null
+       implementation out...
+       * testsuite/testsuite_hooks.cc:  ...to here.
+
 2002-06-06  Loren J. Rittle <ljrittle@acm.org>
 
        * src/Makefile.am (AUTOMAKE_OPTIONS): Use cygnus-style generation.

diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index b104244dba61e7047c62d3acaad8ed9969afbf23..c856b05215291b36e551628c6ea1a3057ff67f44 100755 (executable)
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -314,7 +314,8 @@ test_file()
     # and harder as we try compiling at, say, top of the hour; we would
     # eventually have to calculate time_t anyhow.  Or 3) just grab two
     # time_t's (no more overhead than grabbing two date(1)'s).
-    compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME"
+    our_libs="-L$TEST_DIR -lv3test"
+    compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME $our_libs"
     echo $compiler_invocation >> compile.out 2>&1
     COMP_TIME_START=$($TIMER_COMMAND)
     $compiler_invocation >> compile.out 2>&1

diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 53bd753b1a8f57e6aaf6251115965bf51aaf2a9e..4e8928c77abc784a6ee1118449700ad596ef9b8c 100644 (file)
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -67,6 +67,9 @@ __set_testsuite_memlimit(float __size)
     setrlimit(RLIMIT_AS, &r);
 #endif
 }
+#else
+void
+__set_testsuite_memlimit(float) { }
 #endif /* _GLIBCPP_MEM_LIMITS */
 
 

diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index 4412336d47fbd76bd1acd913cc175023f8bf9a6b..a4be70a9b23de9c6bc87f0b91eee9abce25bc0aa 100644 (file)
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -67,8 +67,7 @@
 #ifndef _GLIBCPP_MEM_LIMITS
 // Don't do memory limits.
 extern void
-__set_testsuite_memlimit(float x = 0)
-{ }
+__set_testsuite_memlimit(float x = 0);
 
 #else