diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-19T00·20+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-19T00·20+0100 |
| commit | ea402a255f9c03a644d256b0d1443a986a2bbebb (patch) | |
| tree | 027c3f75e32377b1fc725e245b56330046150ae8 /tests/logging.sh | |
| parent | 4b23900ff1568270c9a03ccadc1cbd0b872e4ef7 (diff) | |
Replace "make check" with "make installcheck"
Ensuring that the tests work from the build tree requires a growing number of nasty hacks. The tests also don't verify that the installed Nix actually works. Thus, the tests now require "make install" to have been run.
Diffstat (limited to 'tests/logging.sh')
| -rw-r--r-- | tests/logging.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/logging.sh b/tests/logging.sh index 8cedb470656b..2879354cb24d 100644 --- a/tests/logging.sh +++ b/tests/logging.sh @@ -7,7 +7,7 @@ set -x nix-build --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 +nix-log2xml < $TEST_ROOT/log.esc > $TEST_ROOT/log.xml # Is this well-formed XML? if test "$xmllint" != "false"; then @@ -16,7 +16,7 @@ fi # Convert to HTML. if test "$xsltproc" != "false"; then - (cd $TOP/src/nix-log2xml && $xsltproc mark-errors.xsl - | $xsltproc log2html.xsl -) < $TEST_ROOT/log.xml > $TEST_ROOT/log.html + (cd $datadir/nix/log2html && $xsltproc mark-errors.xsl - | $xsltproc log2html.xsl -) < $TEST_ROOT/log.xml > $TEST_ROOT/log.html # Ideally we would check that the generated HTML is valid... # A few checks... |