diff options
author | LRN <lrn1986@gmail.com> | 2013-03-31 01:24:01 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-03-31 01:24:01 +0000 |
commit | b4cdd9e449679b5d38cdffef9e130b0dc7105b20 (patch) | |
tree | ee2ebac113341907414bbc5980a6a3a18043ae29 /src/integration-tests/Makefile.am | |
parent | 548b467c7ec7521165ff287090b14dfa8fc1b8b3 (diff) | |
download | gnunet-b4cdd9e449679b5d38cdffef9e130b0dc7105b20.tar.gz gnunet-b4cdd9e449679b5d38cdffef9e130b0dc7105b20.zip |
Remove temporary W32 buildslave test
Diffstat (limited to 'src/integration-tests/Makefile.am')
-rw-r--r-- | src/integration-tests/Makefile.am | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 04213b4b7..1cce8ab1d 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -33,19 +33,9 @@ check_SCRIPTS = \ | |||
33 | endif | 33 | endif |
34 | # test_integration_disconnect.py | 34 | # test_integration_disconnect.py |
35 | 35 | ||
36 | # This temporary test does one thing: hangs up for 1300 seconds | ||
37 | # to test buildslave hangup process killing functionality | ||
38 | # It's in integration tests because integration-tests is one of the few | ||
39 | # tests that are configured to run under more-than-1200-seconds watchdog | ||
40 | if MINGW | ||
41 | hangup = test_buildslave_hangup.py | ||
42 | else | ||
43 | hangup = | ||
44 | endif | ||
45 | if HAVE_MHD | 36 | if HAVE_MHD |
46 | if ENABLE_TEST_RUN | 37 | if ENABLE_TEST_RUN |
47 | TESTS = \ | 38 | TESTS = \ |
48 | $(hangup) \ | ||
49 | $(check_SCRIPTS) | 39 | $(check_SCRIPTS) |
50 | endif | 40 | endif |
51 | endif | 41 | endif |