author | Stefan Teleman <stefan.teleman@oracle.com> |
Wed, 08 Apr 2015 14:38:53 -0700 | |
changeset 4070 | de7938d475ad |
permissions | -rw-r--r-- |
4070
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Internal patch. |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# Change the output format of the test harness so we can handle |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
# it better with our master test results file. |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
# Not for upstream. |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
--- test/common/tests.c 2013-07-31 06:50:34.000000000 -0700 |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
+++ test/common/tests.c 2015-03-17 19:13:48.294707531 -0700 |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
@@ -154,7 +154,7 @@ |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
static void print_prefix(int n) |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
{ |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
if (quiet) { |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
- printf("\r%s%.*s %2u/%2u ", test_suite, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
+ printf("\n%s%.*s %2u/%2u ", test_suite, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
(int) (strlen(dots) - strlen(test_suite)), dots, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
n + 1, count); |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
} |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
@@ -163,7 +163,7 @@ |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
printf(" %s ", dots); |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
} |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
else { |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
- printf("\r%2d. %s%.*s ", n, test_name, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
+ printf("\n%2d. %s%.*s ", n, test_name, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
(int) (strlen(dots) - strlen(test_name)), dots); |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
} |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
} |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
@@ -393,7 +393,7 @@ |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
printf("<- all tests skipped for `%s'.\n", test_suite); |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
} else { |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
if (quiet) { |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
- printf("\r%s%.*s %2u/%2u ", test_suite, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
+ printf("\n%s%.*s %2u/%2u ", test_suite, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
(int) (strlen(dots) - strlen(test_suite)), dots, |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
passes, count); |
de7938d475ad
20722552 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
if (fails == 0) { |