diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-07-27 11:31:21 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-07-27 11:31:21 +0000 |
| commit | 3bb278c944e2d90f6c99443bdc06a95f2e15697d (patch) | |
| tree | 56702f748e8ed6ebdb89f1684e3448e40364dd30 /testsuite/tests/lib-threads | |
| parent | 9f2955dbeacab2a34ecd5230d3a20e09c8d7feaf (diff) | |
merge changes from 4.00 branching to 4.00.0 (part 2: testsuite)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12787 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/tests/lib-threads')
| -rw-r--r-- | testsuite/tests/lib-threads/test1.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/test4.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/test5.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/test6.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/testA.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/testexit.checker | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-threads/testsignal2.runner | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/tests/lib-threads/test1.checker b/testsuite/tests/lib-threads/test1.checker index cbfe7ce5d..1d1045728 100644 --- a/testsuite/tests/lib-threads/test1.checker +++ b/testsuite/tests/lib-threads/test1.checker @@ -1 +1 @@ -sort test1.result | diff -q test1.reference - +LC_ALL=C sort test1.result | diff -q test1.reference - diff --git a/testsuite/tests/lib-threads/test4.checker b/testsuite/tests/lib-threads/test4.checker index ae27a0d57..b8661a982 100644 --- a/testsuite/tests/lib-threads/test4.checker +++ b/testsuite/tests/lib-threads/test4.checker @@ -1 +1 @@ -sort -u test4.result | diff -q test4.reference - +LC_ALL=C sort -u test4.result | diff -q test4.reference - diff --git a/testsuite/tests/lib-threads/test5.checker b/testsuite/tests/lib-threads/test5.checker index 030fcc91e..e99187571 100644 --- a/testsuite/tests/lib-threads/test5.checker +++ b/testsuite/tests/lib-threads/test5.checker @@ -1 +1 @@ -sort -u test5.result | diff -q test5.reference - +LC_ALL=C sort -u test5.result | diff -q test5.reference - diff --git a/testsuite/tests/lib-threads/test6.checker b/testsuite/tests/lib-threads/test6.checker index 40ab24f87..d2e9930af 100644 --- a/testsuite/tests/lib-threads/test6.checker +++ b/testsuite/tests/lib-threads/test6.checker @@ -1 +1 @@ -sort -u test6.result | diff -q test6.reference - +LC_ALL=C sort -u test6.result | diff -q test6.reference - diff --git a/testsuite/tests/lib-threads/testA.checker b/testsuite/tests/lib-threads/testA.checker index 4c309401d..9f5d00a87 100644 --- a/testsuite/tests/lib-threads/testA.checker +++ b/testsuite/tests/lib-threads/testA.checker @@ -1 +1 @@ -sort testA.result | diff -q testA.reference - +LC_ALL=C sort testA.result | diff -q testA.reference - diff --git a/testsuite/tests/lib-threads/testexit.checker b/testsuite/tests/lib-threads/testexit.checker index 5834e5d00..c1182d6f8 100644 --- a/testsuite/tests/lib-threads/testexit.checker +++ b/testsuite/tests/lib-threads/testexit.checker @@ -1 +1 @@ -sort testexit.result | diff -q testexit.reference - +LC_ALL=C sort testexit.result | diff -q testexit.reference - diff --git a/testsuite/tests/lib-threads/testsignal2.runner b/testsuite/tests/lib-threads/testsignal2.runner index 0e368a924..e215ec6ed 100644 --- a/testsuite/tests/lib-threads/testsignal2.runner +++ b/testsuite/tests/lib-threads/testsignal2.runner @@ -3,4 +3,4 @@ pid=$! sleep 3 kill -INT $pid sleep 1 -kill -9 $pid || true +kill -9 $pid 2>&- || true |