GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-11-28 17:33:13 +03:00
Code Issues Projects Releases Wiki Activity

Make the diff command line absolute

Browse Source
This commit is contained in:
Trevor Elliott 2014-12-04 14:36:26 -08:00
parent ee3647b814
commit c2821da104
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,6 +2,7 @@ UNAME := $(shell uname -s)
ARCH := $(shell uname -m)
TESTS ?= issues regression renamer
TEST_DIFF ?= meld
CABAL_FLAGS ?= -j
@ -127,6 +128,7 @@ test: ${CS_BIN}/cryptol-test-runner
-r output \
-T --hide-successes \
-T --jxml=$(call adjust-path,$(CURDIR)/results.xml) \
-p $(TEST_DIFF) \
)
.PHONY: notebook

12
tests/Main.hs
View File

@ -192,11 +192,13 @@ generateAssertion opts dir file = testCase file $ do
Right _ -> assertFailure $
"Test completed successfully. Please remove " ++ knownFailureFile
| otherwise =
assertFailure $
case mbKnown of
Left (X.SomeException {}) ->
unwords [ optDiff opts, goldFile, resultOut ]
Right fail_msg -> fail_msg
case mbKnown of
Left (X.SomeException {}) ->
do goldFile' <- canonicalizePath goldFile
assertFailure (unwords [ optDiff opts, goldFile', "\\\n ", resultOut ])
Right fail_msg -> assertFailure fail_msg
-- Test Discovery --------------------------------------------------------------