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.
Junio C Hamano committed
May 30, 2011 at 13:43 UTC
ca2a4aa4a477d90b205ecb5f312054ebb0d5d82a
5 files changed
+26
-9
Make
+10
-6
@@ -53,27 +53,26 @@ do
53
)
54
done
55
56
-Wall='-Wall -Wdeclaration-after-statement' tests= jobs=
56
+Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip=
57
case `hostname` in
58
-fc13i386)
59
- GIT_SKIP_TESTS="t9??? $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
58
+fc13i386 | fc15i686)
59
+ skip="t9???"
60
;;
61
esac
62
case `uname` in
63
OpenBSD)
64
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
65
- GIT_SKIP_TESTS="t9200 t9502 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
65
+ skip="t9200 t9502"
66
SHELL_PATH=/usr/local/bin/bash; export SHELL_PATH
67
NO_PEDANTIC=CannotDo NO_JOBS=CannotDo
68
Wall=
69
;;
70
FreeBSD)
71
OLD_ICONV=YesPlease; export OLD_ICONV
72
- GIT_SKIP_TESTS="t5560 $GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
72
+ skip="t5560"
73
;;
74
SunOS)
75
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
76
- GIT_SKIP_TESTS="$GIT_SKIP_TESTS"; export GIT_SKIP_TESTS
76
NO_PEDANTIC=CannotDo Wall=
77
;;
78
esac
@@ -134,6 +133,11 @@ do
133
shift
134
done
135
136
+if test -z "$tests" && test -n "$skip"
137
+then
138
+ : GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
139
+fi
140
+
141
LC_ALL=$LANG
142
export LANG LC_ALL
143
TODO
+13
@@ -8,6 +8,19 @@ The latest copy of this document is found at
8
9
----------------------------------------------------------------
10
11
+gmane=http://thread.gmane.org/gmane.comp.version-control.git/
12
+
13
+* Teach pack protocol to transfer estimated pack size and history
14
+ depth to allow receiving end make more intelligent decision between
15
+ unpack-objects and index-pack.
16
+
17
+ $gmane/173610
18
+
19
+* The "combined" diff always assumes it deals with text files. Teach it
20
+ to punt on binary and also use the textconv.
21
+
22
+ $gname/171613
23
+
24
* Audit use of symbolic-ref without -m in our scripts and for each
25
case decide if leaving a reflog entry for the HEAD is desirable.
26
If so, add them.
cook
+1
-1
@@ -627,7 +627,7 @@ sub wildo {
627
}
628
next if (/^ /);
629
if (defined $topic &&
630
- /Will (?:\S+ )?merge /i) {
630
+ /Will (?:\S+ )?(merge|drop|discard|cook)[. ]/i) {
631
wildo_queue(\%what, $_, $topic);
632
$topic = undef;
633
}
pre-applypatch
+1
-1
@@ -27,6 +27,6 @@ then
27
done
28
if test -n "$bad"
29
then
30
- exit 1
30
+ : exit 1
31
fi
32
fi
worklog
+1
-1
@@ -259,7 +259,7 @@ sub day_summary {
259
if (exists $tag_by_date{$date}) {
260
for my $tagname (@{$tag_by_date{$date}}) {
261
$$total_tags++;
262
- print " Tagged $tagname.\n" if (!$quiet);
262
+ print "Tagged $tagname.\n" if (!$quiet);
263
}
264
}
265