patch_tester.sh (nopristinecache): New shell var, set according to presence or absenc...

	* patch_tester.sh (nopristinecache): New shell var, set according
	to presence or absence of new -nopristinecache option.
	(usage): Document new option.
	(bootntest_pristine): Implement it.

From-SVN: r169273

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1737cc8d264f67a9ce2c8c3af7e0a2c9d5b31d96..1a11db70186e4d4efe0810b65c13373ec603540d 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-26  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * patch_tester.sh (nopristinecache): New shell var, set according
+       to presence or absence of new -nopristinecache option.
+       (usage): Document new option.
+       (bootntest_pristine): Implement it.
+
 2010-11-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * make_sunver.pl: Use elfdump -s to extract symbols if possible,

diff --git a/contrib/patch_tester.sh b/contrib/patch_tester.sh
index 83f3322ee7d42321a134f678d0db6ee9d6a9d594..74b8e9e8ce1a7f22b66cd48cb1b4d811dec88315 100755 (executable)
--- a/contrib/patch_tester.sh
+++ b/contrib/patch_tester.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Tests a set of patches from a directory.
-# Copyright (C) 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2011  Free Software Foundation, Inc.
 # Contributed by Sebastian Pop <sebastian.pop@amd.com>
 
 # This program is free software; you can redistribute it and/or modify
@@ -36,13 +36,14 @@ standby=$default_standby
 default_watermark=0.60
 watermark=$default_watermark
 savecompilers=false
+nopristinecache=false
 nogpg=false
 stop=false
 
 usage() {
     cat <<EOF
 patch_tester.sh [-j<N>] [-standby N] [-watermark N] [-savecompilers] [-nogpg]
-                [-svnpath URL] [-stop]
+                [-svnpath URL] [-stop] [-nopristinecache]
                 <source_dir> [patches_dir [state_dir [build_dir]]]
 
     J is the flag passed to make.  Default is empty string.
@@ -56,6 +57,12 @@ patch_tester.sh [-j<N>] [-standby N] [-watermark N] [-savecompilers] [-nogpg]
     SAVECOMPILERS copies the compilers in the same directory as the
     test results for the non patched version.  Default is not copy.
 
+    NOPRISTINECACHE prevents use of cached test results from any earlier
+    test runs on the pristine version of the branch and revision under
+    test (the default behaviour).  This should be used when testing the
+    same revision and patch with multiple sets of configure options, as
+    these may affect the set of baseline failures.
+
     NOGPG can be used to avoid checking the GPG signature of patches.
 
     URL is the location of the GCC SVN repository.  The default is
@@ -103,6 +110,9 @@ while [ $# -ne 0 ]; do
        -savecompilers)
            savecompilers=true; shift
            ;;
+       -nopristinecache)
+           nopristinecache=true; shift
+           ;;
        -nogpg)
            nogpg=true; shift
            ;;
@@ -366,6 +376,9 @@ bootntest_pristine () {
     current_version=`svn info $SOURCE | grep "^Revision:" | sed -e "s/^Revision://g" -e "s/ //g"`
     PRISTINE=$STATE/$current_branch/$current_version
 
+    if [ $nopristinecache = true ]; then
+      rm -rf $PRISTINE
+    fi
     if [ -d $PRISTINE ]; then
        ln -s $PRISTINE $TESTING/pristine
        return 0