Re: [v3, testsuite] Fix merging default libstdc++.log

[Rainer Orth]

Hi Mike,

> On Apr 16, 2012, at 8:03 AM, Rainer Orth wrote:
>> I've long noticed that libstdc++.log (unlike libstdc++.sum) doesn't
>> contain log entries for tests run from abi.exp, but hadn't looked
>> closer, getting used to check libstdc++.log.sep instead which contained
>> everything I expected.
>
>> ok for mainline?
>
> Ok.  Would have been nice to see the before and after log file...

the full thing is pretty boring, but the gist of the change can be seen
by diffing the output of dg-extract-results.sh -L libstdc++.log.sep:

--- 11-gcc.old/i386-pc-solaris2.11/libstdc++-v3/testsuite/libstdc++.log.dist
2012-04-17 18:59:05.777535114 +0200
+++ 11-gcc/i386-pc-solaris2.11/libstdc++-v3/testsuite/libstdc++.log.fixed   
2012-04-17 18:57:26.890396807 +0200
@@ -1,4 +1,4 @@
-Test Run By ro on Sat Apr 14 19:57:36 2012
+Test Run By ro on Sun Apr 15 22:11:21 2012
 Native configuration is i386-pc-solaris2.11
 
=== libstdc++ tests ===
@@ -15,8 +15,8 @@
 libgomp support detected
 set_ld_library_path_env_vars: 
ld_library_path=:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/../libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc/amd64
 LD_LIBRARY_PATH = 
:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/../libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc/amd64:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libmudflap/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libssp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libitm/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/./gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/./prev-gcc

[differences due to tmp file names omitted ...]

@@ -54,6 +54,226 @@
 Setting LD_LIBRARY_PATH to 
:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/../libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc/amd64::/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/../libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/./libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/gcc/amd64:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libstdc++-v3/src/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libmudflap/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libssp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libgomp/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/i386-pc-solaris2.11/libitm/.libs:/var/gcc/gcc-4.8.0-20120413/11-gcc/./gcc:/var/gcc/gcc-4.8.0-20120413/11-gcc/./prev-gcc
 spawn [open ...]
 
+    libstdc++-v3 check-abi Summary 
+
+# of added symbols: 0
+# of missing symbols:   0
+# of undesignated symbols:  0
+# of incompatible symbols:  0
+
+using: baseline_symbols.txt
+PASS: libstdc++-abi/abi_check
+testcase 
/vol/gcc/src/hg/trunk/solaris/libstdc++-v3/testsuite/libstdc++-abi/abi.exp 
completed in 35 seconds
+Running 
/vol/gcc/src/hg/trunk/solaris/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
 ...
+libgomp support detected
[rest of prettyprinters.exp tests omitted ...]
+testcase 
/vol/gcc/src/hg/trunk/solaris/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
 completed in 45 seconds
+
=== libstdc++ Summary for unix ===
 
 Running target unix/-m64

[similar change for 64-bit variant omitted...]

Rainer

-- 
-
Rainer Orth, Center for Biotechnology, Bielefeld University

Re: [v3, testsuite] Fix merging default libstdc++.log

[Mike Stump]

On Apr 16, 2012, at 8:03 AM, Rainer Orth wrote:
> I've long noticed that libstdc++.log (unlike libstdc++.sum) doesn't
> contain log entries for tests run from abi.exp, but hadn't looked
> closer, getting used to check libstdc++.log.sep instead which contained
> everything I expected.

> ok for mainline?

Ok.  Would have been nice to see the before and after log file...

[v3, testsuite] Fix merging default libstdc++.log

[Rainer Orth]

I've long noticed that libstdc++.log (unlike libstdc++.sum) doesn't
contain log entries for tests run from abi.exp, but hadn't looked
closer, getting used to check libstdc++.log.sep instead which contained
everything I expected.

This weekend, I've observed the same for the prettyprinters.exp failures
reported in PR libstdc++/53006 and decided to investigate.

It turns out that abi_check is the culprit: it emits its own summary in
a style similar to what DejaGnu does:

=== libstdc++-v3 check-abi Summary ===

# of added symbols:  0
# of missing symbols:0
# of undesignated symbols:   0
# of incompatible symbols:   0

using: baseline_symbols.txt

The header format is similar to what runtest emits, but the detail lines
below are completely different.

This is enought to seriously confuse contrib/dg-extract-results.sh -L
badly enough to assume that this header line ends one variant, which
otherwise only happens when doing multilib testing with intermediate
summaries like

=== libstdc++ Summary for unix ===

# of expected passes50

=== libstdc++ Summary for unix/-m64 ===

# of expected passes49
# of unexpected failures1

My (admittedly equally hacky solution) was to change the check-abi
header format enough to avoid this confusion, and suddently the expected
abi.exp and prettyprinters.exp log entries show up in the merged
libstdc++.log as expected.

Bootstrapped on i386-pc-solaris2.11, ok for mainline?

Thanks.
Rainer


2012-04-15  Rainer Orth  

* testsuite/util/testsuite_abi.cc (compare_symbols): Change
summary header to avoid confision with DejaGnu header.

# HG changeset patch
# Parent 5fef8c66380e7570ac7c7a2b4b5aa94646c6bba4
Fix merging default libstdc++.log

diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -530,7 +530,7 @@ compare_symbols(const char* baseline_fil
 	}
 }
 
-  cout << "\n\t\t=== libstdc++-v3 check-abi Summary ===" << endl;
+  cout << "\n\t\t libstdc++-v3 check-abi Summary " << endl;
   cout << endl;
   cout << "# of added symbols:\t\t " << added_names.size() << endl;
   cout << "# of missing symbols:\t\t " << missing_names.size() << endl;


-- 
-
Rainer Orth, Center for Biotechnology, Bielefeld University