From 4ba47205c687772cf73a490eac3a489931d4913b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Sep 2012 11:29:10 -0400 Subject: [PATCH] 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 --- tests/binary-cache.sh | 1 + tests/nix-pull.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 0704a2bb3..ac23fa3f7 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 79e7ae26b..87239948c 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