about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-12T15·29-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-12T15·29-0400
commit4ba47205c687772cf73a490eac3a489931d4913b (patch)
treec01efba8eb4fd308aa0d8dea9d4b9436f10d5995
parent6762424e2471e3e4f9ba9b6bb883d08911d352fb (diff)
Fix test failure on Darwin
Apparently our DBD::SQLite links against /usr/lib/libsqlite3.dylib,
which is an old version that doesn't respect foreign key constraints.
So manifests/cache.sqlite doesn't get updated properly when a manifest
disappears.  We should fix our DBD::SQLite, but in the meantime this
will fix the test.

http://hydra.nixos.org/build/3017959
-rw-r--r--tests/binary-cache.sh1
-rw-r--r--tests/nix-pull.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index 0704a2bb3b8f..ac23fa3f79fc 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -1,6 +1,7 @@
 source common.sh
 
 clearStore
+clearManifests
 
 # Create the binary cache.
 cacheDir=$TEST_ROOT/binary-cache
diff --git a/tests/nix-pull.sh b/tests/nix-pull.sh
index 79e7ae26b5cc..87239948c481 100644
--- a/tests/nix-pull.sh
+++ b/tests/nix-pull.sh
@@ -28,6 +28,6 @@ cat $outPath/input-2/bar
 
 # Check that the derivers are set properly.
 test $(nix-store -q --deriver "$outPath") = "$drvPath"
-nix-store -q --deriver $(readLink $outPath/input-2) | grep -q -- "-input-2.drv" 
+nix-store -q --deriver $(readLink $outPath/input-2) | grep -q -- "-input-2.drv"
 
 clearManifests