diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/data/econvert_format.csv (renamed from test/econvert_format.csv) | 0 | ||||
| -rw-r--r-- | test/data/econvert_format.json (renamed from test/econvert_format.json) | 0 | ||||
| -rw-r--r-- | test/data/f2m_10_a.csv (renamed from test/f2m_10_a.csv) | 0 | ||||
| -rw-r--r-- | test/data/f2m_10_a.csv.in (renamed from test/f2m_10_a.csv.in) | 0 | ||||
| -rw-r--r-- | test/data/f2m_10_a.json (renamed from test/f2m_10_a.json) | 0 | ||||
| -rw-r--r-- | test/data/fp_10_a.csv (renamed from test/fp_10_a.csv) | 0 | ||||
| -rw-r--r-- | test/data/fp_10_a.csv.in (renamed from test/fp_10_a.csv.in) | 0 | ||||
| -rw-r--r-- | test/data/fp_10_a.json (renamed from test/fp_10_a.json) | 0 | ||||
| -rwxr-xr-x | test/ecgen.sh | 12 |
9 files changed, 6 insertions, 6 deletions
diff --git a/test/econvert_format.csv b/test/data/econvert_format.csv index 358d807..358d807 100644 --- a/test/econvert_format.csv +++ b/test/data/econvert_format.csv diff --git a/test/econvert_format.json b/test/data/econvert_format.json index 8bb9bc2..8bb9bc2 100644 --- a/test/econvert_format.json +++ b/test/data/econvert_format.json diff --git a/test/f2m_10_a.csv b/test/data/f2m_10_a.csv index 913fe0f..913fe0f 100644 --- a/test/f2m_10_a.csv +++ b/test/data/f2m_10_a.csv diff --git a/test/f2m_10_a.csv.in b/test/data/f2m_10_a.csv.in index 33d08e3..33d08e3 100644 --- a/test/f2m_10_a.csv.in +++ b/test/data/f2m_10_a.csv.in diff --git a/test/f2m_10_a.json b/test/data/f2m_10_a.json index e04fbd8..e04fbd8 100644 --- a/test/f2m_10_a.json +++ b/test/data/f2m_10_a.json diff --git a/test/fp_10_a.csv b/test/data/fp_10_a.csv index b9ec96c..b9ec96c 100644 --- a/test/fp_10_a.csv +++ b/test/data/fp_10_a.csv diff --git a/test/fp_10_a.csv.in b/test/data/fp_10_a.csv.in index 4f4cff3..4f4cff3 100644 --- a/test/fp_10_a.csv.in +++ b/test/data/fp_10_a.csv.in diff --git a/test/fp_10_a.json b/test/data/fp_10_a.json index 666491a..666491a 100644 --- a/test/fp_10_a.json +++ b/test/data/fp_10_a.json diff --git a/test/ecgen.sh b/test/ecgen.sh index 2f69c60..c1cbc07 100755 --- a/test/ecgen.sh +++ b/test/ecgen.sh @@ -17,16 +17,16 @@ function runs() { function csv() { start_test - assert_matches "${ecgen} --fp -tcsv --input=fp_10_a.csv.in 10" "$(cat fp_10_a.csv)" - assert_matches "${ecgen} --f2m -tcsv --input=f2m_10_a.csv.in 10" "$(cat f2m_10_a.csv)" + assert_matches "${ecgen} --fp -tcsv --input=data/fp_10_a.csv.in 10" "$(cat data/fp_10_a.csv)" + assert_matches "${ecgen} --f2m -tcsv --input=data/f2m_10_a.csv.in 10" "$(cat data/f2m_10_a.csv)" } function json() { start_test - assert_raises "${ecgen} --fp -tjson --input=fp_10_a.csv.in 10" - assert_raises "${ecgen} --f2m -tjson --input=f2m_10_a.csv.in 10" - fp=$(${ecgen} --fp -tjson --input=fp_10_a.csv.in 10 2>/dev/null) - f2m=$(${ecgen} --f2m -tjson --input=f2m_10_a.csv.in 10 2>/dev/null) + assert_raises "${ecgen} --fp -tjson --input=data/fp_10_a.csv.in 10" + assert_raises "${ecgen} --f2m -tjson --input=data/f2m_10_a.csv.in 10" + fp=$(${ecgen} --fp -tjson --input=data/fp_10_a.csv.in 10 2>/dev/null) + f2m=$(${ecgen} --f2m -tjson --input=data/f2m_10_a.csv.in 10 2>/dev/null) assert_raises "${JSON}" 0 "${fp}" assert_matches "${JSON} -x field\\\",\\\"p" "0x000b" "${fp}" assert_matches "${JSON} -x \\\"a\\\"" "0x0001" "${fp}" |