summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2016-01-16 16:03:23 +0000
committerDavid Allsopp <david.allsopp@metastack.com>2016-01-25 15:08:08 +0000
commitb505fc699c9b6c2bc34319d1e656056c92addf1c (patch)
treef9339cacced623570a1e93898a7a885371ec2369 /config
parente66d98e23e0a67526a731b7b5556fbb9bd019411 (diff)
downloadocaml-b505fc699c9b6c2bc34319d1e656056c92addf1c.tar.gz
Improve threading tests on Windows
The `CANKILL` testsuite variable is eliminated in favour of testing for `TOOLCHAIN`. tests/lib-threads/signal.ml can be executed under native Windows by means of a wrapper program to send CTRL+C. tests/lib-threads/signal2.ml is not possible under native Windows because Thread.sigmask is not implemented, so the precheck is updated to reflect this, rather than the lack of kill -INT. tests/lib-threads/sockets.ml is re-enabled, since the two MPRs affecting it have been fixed.
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.mingw1
-rw-r--r--config/Makefile.mingw641
-rw-r--r--config/Makefile.msvc1
-rw-r--r--config/Makefile.msvc641
4 files changed, 0 insertions, 4 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index 2e4d19d0b8..b98fc65ec3 100644
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -189,5 +189,4 @@ OTOPDIR=$(WINTOPDIR)
CTOPDIR=$(TOPDIR)
CYGPATH=cygpath -m
DIFF=diff -q --strip-trailing-cr
-CANKILL=false
SET_LD_PATH=PATH="$(PATH):$(LD_PATH)"
diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64
index 39b0f7f3ac..1936dd7c08 100644
--- a/config/Makefile.mingw64
+++ b/config/Makefile.mingw64
@@ -189,5 +189,4 @@ OTOPDIR=$(WINTOPDIR)
CTOPDIR=$(TOPDIR)
CYGPATH=cygpath -m
DIFF=diff -q --strip-trailing-cr
-CANKILL=false
SET_LD_PATH=PATH="$(PATH):$(LD_PATH)"
diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index b9f53e755e..5d93bacb63 100644
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -191,7 +191,6 @@ OTOPDIR=$(WINTOPDIR)
CTOPDIR=$(WINTOPDIR)
CYGPATH=cygpath -m
DIFF=diff -q --strip-trailing-cr
-CANKILL=false
FIND=/usr/bin/find
SORT=/usr/bin/sort
SET_LD_PATH=PATH="$(PATH):$(LD_PATH)"
diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64
index 3ab556493c..ae2895be78 100644
--- a/config/Makefile.msvc64
+++ b/config/Makefile.msvc64
@@ -195,7 +195,6 @@ OTOPDIR=$(WINTOPDIR)
CTOPDIR=$(WINTOPDIR)
CYGPATH=cygpath -m
DIFF=diff -q --strip-trailing-cr
-CANKILL=false
FIND=/usr/bin/find
SORT=/usr/bin/sort
SET_LD_PATH=PATH="$(PATH):$(LD_PATH)"