From 1dcf208f562d853909ad53772c208dcb2a73de88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 18 Mar 2009 13:15:55 +0000
Subject: * Clean up some tests (use nix-build where appropriate).

---
 tests/logging.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests/logging.sh')

diff --git a/tests/logging.sh b/tests/logging.sh
index 60e2e1234144..dffedcfe59ca 100644
--- a/tests/logging.sh
+++ b/tests/logging.sh
@@ -1,16 +1,17 @@
 source common.sh
 
-$nixstore --gc
+clearStore
 
 # Produce an escaped log file.
-$nixstore --log-type escapes -r -vv $($nixinstantiate dependencies.nix) 2> $TEST_ROOT/log.esc
+set -x
+$nixbuild --log-type escapes -vv dependencies.nix 2> $TEST_ROOT/log.esc
 
 # Convert it to an XML representation.
 $TOP/src/nix-log2xml/nix-log2xml < $TEST_ROOT/log.esc > $TEST_ROOT/log.xml
 
 # Is this well-formed XML?
 if test "$xmllint" != "false"; then
-    $xmllint $xmlflags --noout $TEST_ROOT/log.xml
+    $xmllint $xmlflags --noout $TEST_ROOT/log.xml || fail "malformed XML"
 fi
 
 # Convert to HTML.
@@ -19,5 +20,5 @@ if test "$xsltproc" != "false"; then
     # Ideally we would check that the generated HTML is valid...
 
     # A few checks...
-    grep "<li>.*<code>.*FOO" $TEST_ROOT/log.html
+    grep "<code>.*FOO" $TEST_ROOT/log.html || fail "bad HTML output"
 fi
-- 
cgit 1.4.1