summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
author1Regina <46968488+1Regina@users.noreply.github.com>2021-06-09 10:39:49 +0800
committer1Regina <46968488+1Regina@users.noreply.github.com>2021-06-09 10:39:49 +0800
commitaf87664d273685563cd6444a1fa0ad5391022259 (patch)
tree212e7b857c29286328527453f99a4857007117bc /testsuite
parentaf1360d37e2e94e257f866b99f3fd41a37162a03 (diff)
parent1740181daf0d3b4724f71a0818ea038133610580 (diff)
Merge branch 'enable-tests' of https://github.com/kharus/gf-core into fix-tests
to continue working from ruslan tests
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/run.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/run.hs b/testsuite/run.hs
index 6bf3c8158..7f377af79 100644
--- a/testsuite/run.hs
+++ b/testsuite/run.hs
@@ -14,7 +14,7 @@ main =
ok = length good
fail = ok<cnt
putStrLn $ show ok++"/"++show cnt++ " passed/tests"
- let overview = "dist/test/gf-tests.html"
+ let overview = "gf-tests.html"
writeFile overview (toHTML bad)
if ok<cnt
then do putStrLn $ overview++" contains an overview of the failed tests"
@@ -55,7 +55,8 @@ main =
runTest in_file out_file gold_file = do
input <- readFile in_file
- writeFile out_file =<< run_gf input
+ rgl_lib_dir <- readFile "DATA_DIR"
+ writeFile out_file =<< run_gf ["-run","-gf-lib-path=" ++ rgl_lib_dir] input
exists <- doesFileExist gold_file
if exists
then do out <- compatReadFile out_file
@@ -71,9 +72,8 @@ main =
hGetContents h
-- Should consult the Cabal configuration!
-run_gf = readProcess default_gf ["-run","-gf-lib-path="++gf_lib_path]
-default_gf = "dist/build/gf/gf"<.>exeExtension buildPlatform
-gf_lib_path = "dist/build/rgl"
+run_gf = readProcess default_gf
+default_gf = "gf"<.>exeExtension buildPlatform
-- | List files, excluding "." and ".."
ls path = filter (`notElem` [".",".."]) `fmap` getDirectoryContents path