r176224 - in /branches/pph/gcc/testsuite: Chang...

[crowl at gcc dot gnu dot org]

Author: crowl
Date: Wed Jul 13 01:44:38 2011
New Revision: 176224

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=176224
Log:
Autogenerate pph.map instead of manually maintaining it.
This change avoids tests that appear to pass only because
the pph.map file was not properly updated and the pph file was never read.
We will need to update this automation
when we start PPHing the C++ standard library.
(g++.dg/pph/pph.exp)

Remove the existing pph.map.

Change expectations on tests that now properly read pph files:
c1eabi1.cc x1dynarray1.cc x1dynarray2a.cc x1dynarray2b.cc x6dynarray3.cc
x6dynarray4.cc x6dynarray5.h.

Remove incorrect -fpph-gen option from negative tests.
(lib/dg-pph.exp)

Correct the condition on deleting the negative test assembly file.
Delete the assembly file on header tests. (These are never checked.)
(lib/dg-phh.exp)

Support link tests, which avoids spurious messages when the link fails.
We do this by changing positive tests to track "assembly test or not"
instead of "executable test or not".
(lib/dg-phh.exp)

Change run tests that fail to link into link tests:
x1dynarray1.cc x1dynarray2a.cc x1dynarray2b.cc
These will need to be changed back when we get them to link.

Change header tests to recognize headers with any prefix in [cdpxy].
(g++.dg/pph/pph.exp)

Rename some 'c' tests to 'p' tests
because these tests use C++ namespaces by including C standard headers:
c1pr36533.* c4eabi1.* c4meteor-contest.* c4pr36533.*.
Change references to those files to match.


The following script will provide the status consise of the PPH tests.

#!/bin/sh

filter()
{
sed -e '
	/^PASS: .*test for excess errors/		d
	/-fpph-map=pph.map/	! {
		/^XPASS: .*test for bogus messages/	d
		/^XPASS: .*test for excess errors/	d
		/^XPASS: .*execution test/		d
		/^PASS: .*execution test/		d
	}
	/-fpph-map=pph.map/	{
		/^XFAIL: .*test for excess errors/	d
	}
				s/ -fpph-gen *-fpph-map=pph.map / -fpph-map /g
				s/ -fpph-map=pph.map / -fpph-map /g
				s/, line )/)/
				s/ -I\. / /g
				s/   */ /g
	/^PASS: /		p
	/^XPASS: /		p
	/^XFAIL: /		p
	/^FAIL: /		p
	/^ERROR: /		p
	/^UNRESOLVED: /		p
	d
' $*
}

filter gcc/testsuite/g++/g++.sum | sort -u


Index: gcc/testsuite/ChangeLog.pph

2011-07-12  Lawrence Crowl  <crowl@google.com>

	* lib/dg-pph.exp (dg-pph-pos): Add support for link tests.
	(dg-pph-neg): Remove incorrect -fpph-gen option.
	Delete unneeded assembly files.
	(dg-pph-hdr): Delete unneeded assembly files.
	* g++.dg/pph/pph.exp: Autogenerate pph.map instead of manual tracking.
	Recognise headers with any prefix in [cdpxy].
	* g++.dg/pph/pph.map: Remove.
	* g++.dg/pph/c1pr36533.h: Rename to p1pr36533.h; edit deps.
	* g++.dg/pph/c1pr36533.cc: Rename to p1pr36533.cc.
	* g++.dg/pph/c4eabi1.h: Rename to p4eabi1.h; edit deps.
	* g++.dg/pph/c4eabi1.cc: Rename to p4eabi1.cc.
	* g++.dg/pph/c4meteor-contest.h: Rename to p4meteor-contest.h;
	edit deps.
	* g++.dg/pph/c4meteor-contest.cc: Rename to p4meteor-contest.cc.
	* g++.dg/pph/c4pr36533.h: Rename to p4pr36533.h; edit deps.
	* g++.dg/pph/c4pr36533.cc: Rename to p4pr36533.cc.
	* g++.dg/pph/c1eabi1.cc: Correct test expectation.
	* g++.dg/pph/x1dynarray1.cc: Make link test; correct test expectation.
	* g++.dg/pph/x1dynarray2a.cc: Make link test; correct test expectation.
	* g++.dg/pph/x1dynarray2b.cc: Make link test; correct test expectation.
	* g++.dg/pph/x6dynarray3.cc: Correct test expectation.
	* g++.dg/pph/x6dynarray4.cc: Correct test expectation.
	* g++.dg/pph/x6dynarray5.cc: Correct test expectation.



Added:
    branches/pph/gcc/testsuite/g++.dg/pph/p1pr36533.h
      - copied unchanged from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c1pr36533.h
    branches/pph/gcc/testsuite/g++.dg/pph/p2pr36533.cc
      - copied, changed from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c2pr36533.cc
    branches/pph/gcc/testsuite/g++.dg/pph/p4eabi1.cc
      - copied, changed from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c4eabi1.cc
    branches/pph/gcc/testsuite/g++.dg/pph/p4eabi1.h
      - copied unchanged from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c4eabi1.h
    branches/pph/gcc/testsuite/g++.dg/pph/p4meteor-contest.h
      - copied unchanged from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c4meteor-contest.h
    branches/pph/gcc/testsuite/g++.dg/pph/p4pr36533.cc
      - copied, changed from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c4pr36533.cc
    branches/pph/gcc/testsuite/g++.dg/pph/p4pr36533.h
      - copied unchanged from r176193, branches/pph/gcc/testsuite/g++.dg/pph/c4pr36533.h
Removed:
    branches/pph/gcc/testsuite/g++.dg/pph/c1pr36533.h
    branches/pph/gcc/testsuite/g++.dg/pph/c2pr36533.cc
    branches/pph/gcc/testsuite/g++.dg/pph/c4eabi1.cc
    branches/pph/gcc/testsuite/g++.dg/pph/c4eabi1.h
    branches/pph/gcc/testsuite/g++.dg/pph/c4meteor-contest.h
    branches/pph/gcc/testsuite/g++.dg/pph/c4pr36533.cc
    branches/pph/gcc/testsuite/g++.dg/pph/c4pr36533.h
    branches/pph/gcc/testsuite/g++.dg/pph/pph.map
Modified:
    branches/pph/gcc/testsuite/ChangeLog.pph
    branches/pph/gcc/testsuite/g++.dg/pph/c0meteor-contest.h
    branches/pph/gcc/testsuite/g++.dg/pph/c1eabi1.cc
    branches/pph/gcc/testsuite/g++.dg/pph/c4meteor-contest.cc
    branches/pph/gcc/testsuite/g++.dg/pph/pph.exp
    branches/pph/gcc/testsuite/g++.dg/pph/x1dynarray1.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x1dynarray2a.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x1dynarray2b.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x6dynarray3.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x6dynarray4.cc
    branches/pph/gcc/testsuite/g++.dg/pph/x6dynarray5.h
    branches/pph/gcc/testsuite/lib/dg-pph.exp