about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-22T09·38+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-22T09·38+0200
commit3064a8215608eca391fcb9d492735a662f48242e (patch)
tree079e3363879304339ed2507dd11fe395a05c2f06 /tests
parent9f9080e2c019f188ba679a7a89284d7eaf629710 (diff)
Disable parallel.sh test
It breaks randomly: http://hydra.nixos.org/build/11152871
Diffstat (limited to 'tests')
-rw-r--r--tests/local.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/local.mk b/tests/local.mk
index ab170dfe51e7..add6d7b7b4da 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -3,7 +3,7 @@ check:
 
 nix_tests = \
   init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
-  parallel.sh build-hook.sh substitutes.sh substitutes2.sh \
+  build-hook.sh substitutes.sh substitutes2.sh \
   fallback.sh nix-push.sh gc.sh gc-concurrent.sh nix-pull.sh \
   referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \
   gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \
@@ -11,6 +11,7 @@ nix_tests = \
   binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \
   multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \
   binary-cache.sh nix-profile.sh repair.sh dump-db.sh
+  # parallel.sh
 
 install-tests += $(foreach x, $(nix_tests), tests/$(x))