Makefile.in (distclean): Remove QMTest stuff.

	* Makefile.in (distclean): Remove QMTest stuff.
	(QMTEST_PATH): New variable.
	(QMTESTFLAGS): Likewise.
	(QMTESTRUNFLAGS): Likewise.
	(QMTEST): Likewise.
	(QMTEST_GPP_TESTS): Likewise.
	(QMTEST_DIR): Likewise.
	(QMTEST_DIR/context): New target.
	(qmtest-g++): Likeise.
	(qmtest-gui): Likewise.
	(QMTEST_DIR/gpp-expected.qmr): Likewise.

	* README.QMTEST: New file.

From-SVN: r53654

4 files changed, 271 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf0d2b7..96fe9c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2002-05-19  Mark Mitchell  <mitchell@doubledemon.codesourcery.com>
+
+	* Makefile.in (distclean): Remove QMTest stuff.
+	(QMTEST_PATH): New variable.
+	(QMTESTFLAGS): Likewise.
+	(QMTESTRUNFLAGS): Likewise.
+	(QMTEST): Likewise.
+	(QMTEST_GPP_TESTS): Likewise.
+	(QMTEST_DIR): Likewise.
+	(QMTEST_DIR/context): New target.
+	(qmtest-g++): Likeise.
+	(qmtest-gui): Likewise.
+	(QMTEST_DIR/gpp-expected.qmr): Likewise.
+
 2002-05-19  Aldy Hernandez  <aldyh@redhat.com>
 
         * config/rs6000/rs6000.h (FUNCTION_VALUE): Only return vectors in
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1a49dfb..bdcf3f6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2505,6 +2505,7 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
 	-rm -f float.h
 	-rm -f site.exp site.bak testsuite/site.exp testsuite/site.bak
 	-rm -f testsuite/{gcc,g++}.{log,sum}
+	-rm -rf ${QMTEST_DIR} stamp-qmtest
 	-rm -f intl/libintl.h libintl.h
 	-rm -f cxxmain.c
 	-rm -f mklibgcc gccbug .gdbinit configargs.h
@@ -2987,6 +2988,74 @@ check-consistency: testsuite/site.exp
 	   export TCL_LIBRARY ; fi ; \
 	$(RUNTEST) --tool consistency $(RUNTESTFLAGS)
 
+# QMTest targets
+
+# The path to qmtest.
+QMTEST_PATH=qmtest
+
+# The flags to pass to qmtest.
+QMTESTFLAGS=
+
+# The flags to pass to "qmtest run".
+QMTESTRUNFLAGS=
+
+# The command to use to invoke qmtest.
+QMTEST=${QMTEST_PATH} ${QMTESTFLAGS}
+
+# The tests (or suites) to run.
+QMTEST_GPP_TESTS=gpp
+
+# The subdirectory of the OBJDIR that will be used to store the QMTest
+# test database configuration and that will be used for temporary
+# scratch space during QMTest's execution.
+QMTEST_DIR=${objdir}/qmtestsuite
+
+# Create the QMTest database configuration.
+${QMTEST_DIR} stamp-qmtest:
+	debug_options=""; \
+	    ${STAMP} empty.C; \
+	    for option in \
+	        -gdwarf-2 -gstabs -gstabs+ -gxcoff -gxcoff+ -gcoff; do \
+		(./cc1plus -q $${option} empty.C 2>&1 | \
+		     grep "unknown or unsupported -g option" > /dev/null) || \
+		debug_options="$${debug_options}$${option} "; done; \
+	    ${QMTEST} -D ${QMTEST_DIR} create-tdb \
+	        -c gcc_database.GCCDatabase \
+	        -a GCCDatabase.testsuite_root=`cd ${srcdir}/testsuite && pwd` \
+	        -a GCCDatabase.debug_options="$${debug_options}"
+	rm -f empty.C empty.s
+	$(STAMP) stamp-qmtest
+
+# Create the QMTest context file.
+${QMTEST_DIR}/context: stamp-qmtest
+	echo "GCCTest.flags=-B${objdir}" >> $@
+	echo "GCCTest.objdir=${objdir}/.." >> $@
+	echo "GCCTest.host=${host_canonical}" >> $@
+	echo "GCCTest.target=${target}" >> $@
+	echo "GCCTest.gcov=${objdir}/gcov" >> $@
+	echo "GPPTest.gpp=${objdir}/g++" >> $@
+	echo "DGTest.demangler=${objdir}/c++filt" >> $@
+
+# Run the G++ testsuite using QMTest.
+qmtest-g++: ${QMTEST_DIR}/context ${QMTEST_DIR}/gpp-expected.qmr
+	cd ${QMTEST_DIR} && ${QMTEST} run ${QMTESTRUNFLAGS} -C context \
+	   -o gpp.qmr -O ${QMTEST_DIR}/gpp-expected.qmr \
+	   ${QMTEST_GPP_TESTS}
+
+# Use the QMTest GUI.
+qmtest-gui: ${QMTEST_DIR}/context
+	cd ${QMTEST_DIR} && ${QMTEST} gui -C context
+
+# Build the set of expected G++ failures.
+${QMTEST_DIR}/gpp-expected.qmr: ${QMTEST_DIR}/context
+	echo "Determining expected results..."
+	cd ${QMTEST_DIR} && ${QMTEST} run ${QMTESTRUNFLAGS} -C context \
+           -c "GCCTest.generate_xfails=1" -o gpp-expected.qmr \
+	   ${QMTEST_GPP_TESTS} \
+	   > /dev/null
+
+.PHONY: qmtest-g++
+
 # These exist for maintenance purposes.
 
 # Update the tags table.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 015fc63..811e1c4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2002-05-19  Mark Mitchell  <mitchell@doubledemon.codesourcery.com>
 
+	* README.QMTEST: New file.
+
 	* g++.dg/warn/Wshadow-1.C: Remove unncessary dg-error line.
 
 2002-05-19  Andreas Jaeger  <aj@suse.de>
diff --git a/gcc/testsuite/README.QMTEST b/gcc/testsuite/README.QMTEST
new file mode 100644
index 0000000..00fcc4f
--- /dev/null
+++ b/gcc/testsuite/README.QMTEST
@@ -0,0 +1,186 @@
+Testing with QMTest
+===================
+
+You can use QMTest to test G++.  (In the future, it may be possible to
+test other parts of GCC with QMTest as well, but it is not possible
+yet.)
+
+The use of QMTest to run the G++ tests has not been approved as an
+officially supported testing procedure.  Therefore, you must run the
+tests using DejaGNU (with "make check-g++") before committing changes
+that affect G++.
+
+Differences from DejaGNU
+========================
+
+Although QMTest can be used to run the G++ test suite, it works
+somewhat differently from DejaGNU.  In particular:
+
+- In DejaGNU, a single source file contains many tests.  Each 
+  line where a diagnostic is expected is considered a separate
+  test.  Testing for successful compilation and testing for 
+  successful execution of the generated program are considered
+  separate tests.  Thus, a test "test.C" could contain, say, 
+  seven tests; some of which might pass and some of which might
+  fail.
+
+  With QMTest, each source file is considered a single test.  If any
+  of the seven sub-tests fail, the entire test is considered to fail.
+  However, QMTest does present information about *why* the test
+  failed, so the same information is effectively available.
+
+  It is true that, therefore, causing an already failing test to "fail
+  more" is not immediately detectable through an additional unexpected
+  failure messages when using QMTest.  On the other hand, most people
+  seem to think of each source file as "a test", not "twelve tests",
+  so the model QMTest uses may be more natural.
+
+- In DejaGNU, tests themselves keep track of expected and unexpected
+  failures.  The QMTest philosophy is that expected failures should be
+  stored separately from the tests themselves; in particular, that
+  tonights results can be tomorrow's expectations.  In order to
+  preserve compatibility with DejaGNU, the first time you use QMTest
+  to test G++, QMTest computes the set of expected failures indicated
+  by the tests, and then compares the actual results with these
+  results.  Therefore, if you change the expected failure notations in
+  the DejaGNU tests, you must rebuild the set of expected failures.
+
+  To do this, remove the file "qmtestsuite/gpp-expected.qmr".  Then,
+  when you rerun the tests, the expected failures will be
+  automatically recalculated.
+
+Setting Up
+==========
+
+You must download and install the following software:
+
+- Python 2.1 (or greater)
+
+  See http://www.python.org.
+
+  You may already have Python on your system; in particular, many
+  GNU/Linux systems ship with Python installed.
+
+  Installation instructions are available on the web-site.
+
+- QMTest 1.1.4 (or greater)
+
+  See http://www.qmtest.com.
+
+  QMTest is available at:
+
+    http://www.codesourcery.com/qm/qmtest_download
+    
+  or:
+
+    ftp://ftp.codesourcery.com/pub/qmtest
+
+  Installation instructions are available on the web-site.
+
+- QMTC 1.1
+
+  This package is available from:
+
+  ftp://ftp.codesourcery.com/pub/qmtest/qmtest/qmtc/qmtc-<version>.tar.gz
+
+  See the file called INSTALL in the distribution.
+
+Running the Tests
+=================
+
+To run the tests, run "make qmtest-g++" in the gcc directory of your
+build tree.  The first time that you do this, QMTest will calculate
+the set of tests that are expected to fail on your platform, so it
+will take several minutes before you see any test results.  After the
+first time, QMTest will start running the tests much more quickly.
+
+If the test summary printed at the test run indicates no unexpected
+failures, then G++ is behaving as expected on your target.  (Some
+unexpected passes are normal.)
+
+You can obtain detailed information about why tests failed in one 
+of two ways: 
+
+1. By invoking QMTest with the "-f full" option.  For example:
+
+     make QMTESTRUNFLAGS="-f full" qmtest-g++
+
+2. Examining the log file qmtestsuite/gpp.qmr after the tests have
+   run.
+
+Here are some more advanced usage instructions:
+
+1. To run a particular set of tests (rather than all of the tests),
+   use the make variable "QMTEST_GPP_TESTS".  For example, 
+
+     make QMTEST_GPP_TESTS="gpp.dg" qmtest-g++
+
+   will run only the tests in the g++.dg subdirectory, and:
+
+     make QMTEST_GPP_TESTS="gpp.dg.special.conpr1 gpp.old-deja.other.access2"
+          qmtest-g++
+
+   will run only the two tests indicated.
+     
+2. To run qmtest with particular flags, use the make variables
+   "QMTESTFLAGS" and "QMTESTRUNFLAGS".  For example:
+
+      make QMTESTFLAGS="-v" QMTESTRUNFLAGS="-f full" qmtest-g++
+
+   will run qmtest like this:
+
+      qmtest -v run -f full ... 
+
+3. To run the compiler with particular flags, use QMTESTRUNFLAGS to
+   set the QMTest context variable "GPPTest.flags", like this:
+
+      make QMTESTRUNFLAGS='-c GPPTest.flags="-funroll-loops"' qmtest-g++
+
+   The compiler will then use the "-funroll-loops" switch when
+   compiling.
+
+4. If qmtest is not in your path, you can indicate the full path to
+   QMTest by using the make variable "QMTEST_PATH", like this:
+
+      make QMTEST_PATH=/path/to/qmtest qmtest-g++
+
+5. To start the QMTest GUI, use:
+
+      make qmtest-gui
+
+   (Note that this will run the program called "netscape" in your path.
+   If you want to use another browser, you must configure qmtest as
+   described in its manual.)
+
+   Bear in mind that the QMTest GUI is insecure; malicious users with
+   access to your machine may be able to run commands as if they were
+   you.  The QMTest GUI only binds to the loopback IP addresss, which
+   provides a measure of security, but not enough for use in untrusted
+   environments.
+
+6. If you have a multiprocessor, you can run the tests in parallel by
+   passing the "-j" option to qmtest:
+
+      make QMTESTRUNFLAGS="-j 4" qmtest-g++
+
+   will run tests in four threads.  (It is also possible to run tests
+   across multiple machines; for more information see the QMTest
+   manual.)
+
+7. If you are testing a cross compiler, you must specify an interpreter
+   that is capable of running the generated program.  It must be a 
+   program "p" such that:
+
+      p program arg1 arg2 arg3 ...
+
+   behaves exactly like running:
+
+      program arg1 arg2 arg3 ...
+
+   would on the target machine.  You specify this program via the 
+   "CompilerTest.interpreter" context variable:
+
+      make QMTESTRUNFLAGS='-c CompilerTest.interpreter=/path/to/interpreter'
+           qmtest-g++
+
+