Drop CSV support.

3 files changed, 6 insertions, 37 deletions

diff --git a/test/Makefile b/test/Makefile
index 0823862..13bcd32 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,9 +5,9 @@
 #
 ####
 
-test: ecgen econvert
+test: ecgen
 
-unittest: unit ecgen econvert
+unittest: unit ecgen
 
 unit:
 	cd lib/criterion && mkdir -p build && cd build && cmake ..  >/dev/null && cmake --build . >/dev/null
@@ -16,9 +16,6 @@ unit:
 ecgen:
 	./ecgen.sh
 
-econvert:
-	./econvert.sh
-
 clean:
 	+$(MAKE) -C src clean
 
diff --git a/test/ecgen.sh b/test/ecgen.sh
index 145c3a4..22ac164 100755
--- a/test/ecgen.sh
+++ b/test/ecgen.sh
@@ -15,18 +15,12 @@ function runs() {
 	assert_raises "${ecgen}" 64
 }
 
-function csv() {
-	start_test
-	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=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 "${ecgen} --fp --input=data/fp_10_a.csv.in 10"
+	assert_raises "${ecgen} --f2m --input=data/f2m_10_a.csv.in 10"
+	fp=$(${ecgen} --fp --input=data/fp_10_a.csv.in 10 2>/dev/null)
+	f2m=$(${ecgen} --f2m --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}"
@@ -116,7 +110,6 @@ function twist() {
 function cli() {
 	start_test
 	assert_raises "${ecgen} --threads=a" 1
-	assert_raises "${ecgen} --format=something" 1
 	assert_raises "${ecgen} --koblitz=2" 1
 	assert_raises "${ecgen} --points=something" 1
 	assert_raises "${ecgen} --seed=some" 64
@@ -137,7 +130,6 @@ function hex() {
 . ${ASSERT} -v
 start_suite
 runs
-csv
 json
 exhaustive
 ansix962
diff --git a/test/econvert.sh b/test/econvert.sh
deleted file mode 100755
index ed1943c..0000000
--- a/test/econvert.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-####
-#
-# ecgen, tool for generating Elliptic curve domain parameters
-# Copyright (C) 2017 J08nY
-#
-####
-
-. ./common.sh
-
-function runs() {
-	start_test
-	assert_raises "${econvert} --help"
-	assert_raises "${econvert} --version"
-}
-
-. ${ASSERT} -v
-start_suite
-runs
-end_suite econvert
\ No newline at end of file