Meta/Make: update test skipping logic

Request to "Meta/Make --test=????" should override the default built-in
list of tests to skip on each test bochs.

diff --git a/Make b/Make
index 607ee29756e4dab6da91293030743c6449a7f652..698d93625b94c723083258ecc7b91921270d566f 100755 (executable)
--- a/Make
+++ b/Make
@@ -53,27 +53,26 @@ do
        )
 done
 
-Wall='-Wall -Wdeclaration-after-statement' tests= jobs=
+Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip=
 case `hostname` in
-fc13i386)
-       GIT_SKIP_TESTS="t9??? $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+fc13i386 | fc15i686)
+       skip="t9???"
        ;;
 esac
 case `uname` in
 OpenBSD)
        NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
-       GIT_SKIP_TESTS="t9200 t9502 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+       skip="t9200 t9502"
        SHELL_PATH=/usr/local/bin/bash; export SHELL_PATH
        NO_PEDANTIC=CannotDo NO_JOBS=CannotDo
        Wall=
        ;;
 FreeBSD)
        OLD_ICONV=YesPlease; export OLD_ICONV
-       GIT_SKIP_TESTS="t5560 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
+       skip="t5560"
        ;;
 SunOS)
        NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
-       GIT_SKIP_TESTS="$GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
        NO_PEDANTIC=CannotDo Wall=
        ;;
 esac
@@ -134,6 +133,11 @@ do
        shift
 done
 
+if test -z "$tests" && test -n "$skip"
+then
+       : GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
+fi
+
 LC_ALL=$LANG
 export LANG LC_ALL
 

diff --git a/TODO b/TODO
index fdd2758446165aff0ea4d6e3c19b13625a79a3ea..1271bbbfb4f6d01dc1bdbb6c1a729b4ed4c754dd 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,6 +8,19 @@ The latest copy of this document is found at
 
 ----------------------------------------------------------------
 
+gmane=http://thread.gmane.org/gmane.comp.version-control.git/
+
+* Teach pack protocol to transfer estimated pack size and history
+  depth to allow receiving end make more intelligent decision between
+  unpack-objects and index-pack.
+
+  $gmane/173610
+
+* The "combined" diff always assumes it deals with text files. Teach it
+  to punt on binary and also use the textconv.
+
+  $gname/171613
+
 * Audit use of symbolic-ref without -m in our scripts and for each
   case decide if leaving a reflog entry for the HEAD is desirable.
   If so, add them.

diff --git a/cook b/cook
index fc11734aefcf0bd6cbbf9871a265c72d2d1d05dc..81e45d700b26a0db06d336640fb97173d5a94b13 100755 (executable)
--- a/cook
+++ b/cook
@@ -627,7 +627,7 @@ sub wildo {
                }
                next if (/^ /);
                if (defined $topic &&
-                   /Will (?:\S+ )?merge /i) {
+                   /Will (?:\S+ )?(merge|drop|discard|cook)[. ]/i) {
                        wildo_queue(\%what, $_, $topic);
                        $topic = undef;
                }

diff --git a/pre-applypatch b/pre-applypatch
index ae85e5a2d6c7f0c3827849318e82e9f89817bc76..4e6dbebd6fdeb2d0c9729e2dad1136f24b4d808d 100755 (executable)
--- a/pre-applypatch
+++ b/pre-applypatch
@@ -27,6 +27,6 @@ then
        done
        if test -n "$bad"
        then
-               exit 1
+               : exit 1
        fi
 fi

diff --git a/worklog b/worklog
index 99a6a682f545492472767f5a0173240817b82c1b..c2ee60ce034d495f479423e2bb0307c89d4e4633 100755 (executable)
--- a/worklog
+++ b/worklog
@@ -259,7 +259,7 @@ sub day_summary {
        if (exists $tag_by_date{$date}) {
                for my $tagname (@{$tag_by_date{$date}}) {
                        $$total_tags++;
-                       print " Tagged $tagname.\n" if (!$quiet);
+                       print "Tagged $tagname.\n" if (!$quiet);
                }
        }