# HG changeset patch # User Chris Cannam # Date 1493318175 -3600 # Thu Apr 27 19:36:15 2017 +0100 # Node ID 61b11a5beb4fad6d9891613e279425e7bf11a5c9 # Parent dc273e13e834ce0791dfd1a818aed3535add7b93 Rename test to jsonparse (since it does that) diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -test: test.mlb json.sml test.sml +jsonparse: jsonparse.mlb json.sml jsonparse.sml mlton $< ./test.sh > test.log 2>&1 tail -3 test.log clean: - rm -f test test.log + rm -f jsonparse test.log diff --git a/test.mlb b/jsonparse.mlb rename from test.mlb rename to jsonparse.mlb --- a/test.mlb +++ b/jsonparse.mlb @@ -1,4 +1,4 @@ $(SML_LIB)/basis/basis.mlb json.sml -test.sml +jsonparse.sml main.sml diff --git a/test.sml b/jsonparse.sml rename from test.sml rename to jsonparse.sml diff --git a/test.sh b/test.sh --- a/test.sh +++ b/test.sh @@ -13,7 +13,7 @@ for testfile in testfiles/test_parsing/*.json testfiles/merged/merged-in.json ; do - output=$(./test "$testfile") + output=$(./jsonparse "$testfile") base=$(basename $testfile) case $base in @@ -43,9 +43,9 @@ m_expected=testfiles/merged/merged-expected.json m_collapsed=testfiles/merged/expected-collapsed.json -./test $m_in > $m_out +./jsonparse $m_in > $m_out -reread=$(./test $m_out) +reread=$(./jsonparse $m_out) if [ -n "$reread" ] then pass=$(($pass + 1)) echo "--- pass: merged file conversion can be re-read"