[libcw-cvs] [CVS] Module src

[Carlo W. <li...@us...>]

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-00-01 04:43:15 UTC

Modified files:
     libcwd/testsuite/libcwd.tst/dlopen.re
     libcwd/testsuite/libcwd.tst/test.exp

Log message:

On FreeBSD, which doesn't have _dl_loaded, less allocations are done.
As a result, the variations in the debug output of this test vary
too much: just test the relevant part and skip "anything" before it.

---------------------- diff included ----------------------
Index: src/libcwd/testsuite/libcwd.tst/dlopen.re
diff -u src/libcwd/testsuite/libcwd.tst/dlopen.re:1.8 src/libcwd/testsuite/libcwd.tst/dlopen.re:1.9
--- src/libcwd/testsuite/libcwd.tst/dlopen.re:1.8	Sat Dec 29 20:17:51 2001
+++ src/libcwd/testsuite/libcwd.tst/dlopen.re	Mon Dec 31 20:43:04 2001
@@ -1,20 +1,11 @@
-// input lines 3
-// output till ^MALLOC
-((WARNING : core size is limited.*
-)*BFD     : Loading debug info from.*
+// input lines 2
+// output till Loading debug info from
+(.*
 )*
-// input lines 4
-// output till ^BFD     : Loading
-(MALLOC  : (malloc\([0-9]*\)|calloc\([0-9]*, [0-9]*\)) = <unfinished>
-BFD     :     address 0x[0-9a-f]* corresponds to (dl-[a-z]*\.c|specific\.c|dlerror\.c):[0-9]*
-MALLOC  : <continued> 0x[0-9a-f]*
-)+
-BFD     : Loading debug info from \./module\.so \(0x[0-9a-f]*\) \.\.\. done \([0-9]* symbols\)
-// input lines 4
+BFD     : Loading debug info from \./module\.so \(0x[a-f0-9]*\) \.\.\. done \([0-9]* symbols\)
+// input lines 2
 // output till malloc\(310\)
-(MALLOC  : malloc\(28\) = <unfinished>
-BFD     :     address 0x[0-9a-f]* corresponds to stl_alloc.h:[0-9]*
-MALLOC  : <continued> 0x[0-9a-f]*
+(.*
 )*
 MALLOC  : malloc\(310\) = <unfinished>
 BFD     :     address 0x[0-9a-f]* corresponds to module.cc:16
@@ -28,5 +19,5 @@
 // input lines 2
 // output till ^NOTICE
 (malloc    0x[0-9a-f]* *(dl-[a-z]*\.c|stl_alloc\.h|specific\.c|dlerror\.c):[0-9]* *<unknown type>; \(sz = [0-9]*\) 
-)+
+)*
 NOTICE  : Finished
Index: src/libcwd/testsuite/libcwd.tst/test.exp
diff -u src/libcwd/testsuite/libcwd.tst/test.exp:1.6 src/libcwd/testsuite/libcwd.tst/test.exp:1.7
--- src/libcwd/testsuite/libcwd.tst/test.exp:1.6	Sat Dec 29 20:17:51 2001
+++ src/libcwd/testsuite/libcwd.tst/test.exp	Mon Dec 31 20:43:05 2001
@@ -2,7 +2,7 @@
 global SHAREDLIBS STATICLIBS
 
 catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
-# set srcfiles $srcdir/$subdir/alloctag.cc
+# set srcfiles $srcdir/$subdir/dlopen.cc
 verbose "srcfiles are $srcfiles"
 
 set prefix ""
----------------------- End of diff -----------------------