aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/Makefile.am
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2013-03-30 16:18:08 +0000
committerLRN <lrn1986@gmail.com>2013-03-30 16:18:08 +0000
commit468b3707c580e37fa52783c3c95b3604ef04811a (patch)
treeb6e6718b232ec85850920db13f35e03ed8eb1c53 /src/integration-tests/Makefile.am
parenteb1c89613133e4f112c6c6cfa12f826460795747 (diff)
downloadgnunet-468b3707c580e37fa52783c3c95b3604ef04811a.tar.gz
gnunet-468b3707c580e37fa52783c3c95b3604ef04811a.zip
A temporary test for buildslave process killing
Diffstat (limited to 'src/integration-tests/Makefile.am')
-rw-r--r--src/integration-tests/Makefile.am11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index e42fb0c33..51885ead4 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -33,10 +33,19 @@ check_SCRIPTS = \
33endif 33endif
34# test_integration_disconnect.py 34# test_integration_disconnect.py
35 35
36 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
40if MINGW
41 hangup_SCRIPTS = test_buildslave_hangup.py
42else
43 hangup_SCRIPTS =
44endif
37if HAVE_MHD 45if HAVE_MHD
38if ENABLE_TEST_RUN 46if ENABLE_TEST_RUN
39TESTS = \ 47TESTS = \
48 $(hangup_SCRIPTS) \
40 $(check_SCRIPTS) 49 $(check_SCRIPTS)
41endif 50endif
42endif 51endif