From c8a585fa07be4baa25a507f4b655429fddc86df2 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 25 Sep 2015 16:51:12 -0400 Subject: [PATCH] test-reorg iterate --- c/Makefile.am | 2 +- c/Makefile.no-autoconfig | 4 ++-- c/{test => reg_test}/Makefile.am | 0 c/{test => reg_test}/README.md | 0 c/{test => reg_test}/expected/Makefile.am | 0 c/{test => reg_test}/expected/out | 0 c/{test => reg_test}/input/Makefile.am | 0 c/{test => reg_test}/input/a.csv | 0 c/{test => reg_test}/input/a.pprint | 0 c/{test => reg_test}/input/abixy | 0 c/{test => reg_test}/input/abixy-wide | 0 c/{test => reg_test}/input/b.csv | 0 c/{test => reg_test}/input/b.pprint | 0 c/{test => reg_test}/input/c.csv | 0 c/{test => reg_test}/input/c.pprint | 0 c/{test => reg_test}/input/d.csv | 0 c/{test => reg_test}/input/d.pprint | 0 c/{test => reg_test}/input/dots.pprint | 0 c/{test => reg_test}/input/dots.xtab | 0 c/{test => reg_test}/input/double-ps.dkvp | 0 c/{test => reg_test}/input/e.csv | 0 c/{test => reg_test}/input/e.pprint | 0 c/{test => reg_test}/input/f.csv | 0 c/{test => reg_test}/input/f.pprint | 0 c/{test => reg_test}/input/fsec2xhms | 0 c/{test => reg_test}/input/g.csv | 0 c/{test => reg_test}/input/g.pprint | 0 c/{test => reg_test}/input/gmt2sec | 0 c/{test => reg_test}/input/het.csv | 0 c/{test => reg_test}/input/het.dkvp | 0 c/{test => reg_test}/input/joina.dkvp | 0 c/{test => reg_test}/input/joinb.dkvp | 0 c/{test => reg_test}/input/minmax.dkvp | 0 c/{test => reg_test}/input/missings.dkvp | 0 c/{test => reg_test}/input/multi-ips.dkvp | 0 c/{test => reg_test}/input/multi-sep.csvl | 0 c/{test => reg_test}/input/multi-sep.dkvp | 0 c/{test => reg_test}/input/null-fields.csv | 0 c/{test => reg_test}/input/null-fields.nidx | 0 c/{test => reg_test}/input/regularize.dkvp | 0 c/{test => reg_test}/input/rfc-csv/Makefile.am | 0 .../input/rfc-csv/modify-defaults.csv | 0 .../input/rfc-csv/narrow-truncated.csv | 0 c/{test => reg_test}/input/rfc-csv/narrow.csv | 0 .../input/rfc-csv/quoted-comma-truncated.csv | 0 .../input/rfc-csv/quoted-comma.csv | 0 .../input/rfc-csv/quoted-crlf-truncated.csv | 0 .../input/rfc-csv/quoted-crlf.csv | 0 .../input/rfc-csv/simple-truncated.csv | 0 c/{test => reg_test}/input/rfc-csv/simple.csv | 0 c/{test => reg_test}/input/sec2gmt | 0 c/{test => reg_test}/input/sec2xhms | 0 c/{test => reg_test}/input/short | 0 c/{test => reg_test}/input/small | 0 c/{test => reg_test}/input/space-pad.dkvp | 0 c/{test => reg_test}/input/space-pad.nidx | 0 c/{test => reg_test}/input/space-pad.pprint | 0 c/{test => reg_test}/input/truncated.csv | 0 c/{test => reg_test}/input/truncated.dkvp | 0 c/{test => reg_test}/input/truncated.nidx | 0 c/{test => reg_test}/input/truncated.pprint | 0 c/{test => reg_test}/input/truncated.xtab | 0 c/{test => reg_test}/input/truncated.xtab-crlf | 0 c/{test => reg_test}/input/utf8-1.csv | 0 c/{test => reg_test}/input/utf8-2.csv | 0 c/{test => reg_test}/input/utf8-align.dkvp | 0 c/{test => reg_test}/input/utf8-align.nidx | 0 c/{test => reg_test}/run | 18 +++++++++--------- 68 files changed, 12 insertions(+), 12 deletions(-) rename c/{test => reg_test}/Makefile.am (100%) rename c/{test => reg_test}/README.md (100%) rename c/{test => reg_test}/expected/Makefile.am (100%) rename c/{test => reg_test}/expected/out (100%) rename c/{test => reg_test}/input/Makefile.am (100%) rename c/{test => reg_test}/input/a.csv (100%) rename c/{test => reg_test}/input/a.pprint (100%) rename c/{test => reg_test}/input/abixy (100%) rename c/{test => reg_test}/input/abixy-wide (100%) rename c/{test => reg_test}/input/b.csv (100%) rename c/{test => reg_test}/input/b.pprint (100%) rename c/{test => reg_test}/input/c.csv (100%) rename c/{test => reg_test}/input/c.pprint (100%) rename c/{test => reg_test}/input/d.csv (100%) rename c/{test => reg_test}/input/d.pprint (100%) rename c/{test => reg_test}/input/dots.pprint (100%) rename c/{test => reg_test}/input/dots.xtab (100%) rename c/{test => reg_test}/input/double-ps.dkvp (100%) rename c/{test => reg_test}/input/e.csv (100%) rename c/{test => reg_test}/input/e.pprint (100%) rename c/{test => reg_test}/input/f.csv (100%) rename c/{test => reg_test}/input/f.pprint (100%) rename c/{test => reg_test}/input/fsec2xhms (100%) rename c/{test => reg_test}/input/g.csv (100%) rename c/{test => reg_test}/input/g.pprint (100%) rename c/{test => reg_test}/input/gmt2sec (100%) rename c/{test => reg_test}/input/het.csv (100%) rename c/{test => reg_test}/input/het.dkvp (100%) rename c/{test => reg_test}/input/joina.dkvp (100%) rename c/{test => reg_test}/input/joinb.dkvp (100%) rename c/{test => reg_test}/input/minmax.dkvp (100%) rename c/{test => reg_test}/input/missings.dkvp (100%) rename c/{test => reg_test}/input/multi-ips.dkvp (100%) rename c/{test => reg_test}/input/multi-sep.csvl (100%) rename c/{test => reg_test}/input/multi-sep.dkvp (100%) rename c/{test => reg_test}/input/null-fields.csv (100%) rename c/{test => reg_test}/input/null-fields.nidx (100%) rename c/{test => reg_test}/input/regularize.dkvp (100%) rename c/{test => reg_test}/input/rfc-csv/Makefile.am (100%) rename c/{test => reg_test}/input/rfc-csv/modify-defaults.csv (100%) rename c/{test => reg_test}/input/rfc-csv/narrow-truncated.csv (100%) rename c/{test => reg_test}/input/rfc-csv/narrow.csv (100%) rename c/{test => reg_test}/input/rfc-csv/quoted-comma-truncated.csv (100%) rename c/{test => reg_test}/input/rfc-csv/quoted-comma.csv (100%) rename c/{test => reg_test}/input/rfc-csv/quoted-crlf-truncated.csv (100%) rename c/{test => reg_test}/input/rfc-csv/quoted-crlf.csv (100%) rename c/{test => reg_test}/input/rfc-csv/simple-truncated.csv (100%) rename c/{test => reg_test}/input/rfc-csv/simple.csv (100%) rename c/{test => reg_test}/input/sec2gmt (100%) rename c/{test => reg_test}/input/sec2xhms (100%) rename c/{test => reg_test}/input/short (100%) rename c/{test => reg_test}/input/small (100%) rename c/{test => reg_test}/input/space-pad.dkvp (100%) rename c/{test => reg_test}/input/space-pad.nidx (100%) rename c/{test => reg_test}/input/space-pad.pprint (100%) rename c/{test => reg_test}/input/truncated.csv (100%) rename c/{test => reg_test}/input/truncated.dkvp (100%) rename c/{test => reg_test}/input/truncated.nidx (100%) rename c/{test => reg_test}/input/truncated.pprint (100%) rename c/{test => reg_test}/input/truncated.xtab (100%) rename c/{test => reg_test}/input/truncated.xtab-crlf (100%) rename c/{test => reg_test}/input/utf8-1.csv (100%) rename c/{test => reg_test}/input/utf8-2.csv (100%) rename c/{test => reg_test}/input/utf8-align.dkvp (100%) rename c/{test => reg_test}/input/utf8-align.nidx (100%) rename c/{test => reg_test}/run (97%) diff --git a/c/Makefile.am b/c/Makefile.am index 9f1d35eaf..c4308f2c9 100644 --- a/c/Makefile.am +++ b/c/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= lib cli stream input mapping output containers dsls experimental tools . test +SUBDIRS= lib cli stream input mapping output containers dsls experimental tools . reg_test AM_CPPFLAGS= -I${srcdir} AM_CFLAGS= -Wall -Werror -std=gnu99 -O3 diff --git a/c/Makefile.no-autoconfig b/c/Makefile.no-autoconfig index afb74d23f..83a38ff97 100644 --- a/c/Makefile.no-autoconfig +++ b/c/Makefile.no-autoconfig @@ -207,13 +207,13 @@ unit-test: test-mlrutil test-argparse test-byte-readers test-peek-file-reader te @echo DONE reg-test: - ./test/run + ./reg_test/run # ---------------------------------------------------------------- # Run this after unit-test expected output has changed, and is verified to be # OK. (Example: after adding new test cases in test/run.) regtest-copy: - cp output/out test/expected + cp output/out reg_test/expected # ---------------------------------------------------------------- # Unit-test executables diff --git a/c/test/Makefile.am b/c/reg_test/Makefile.am similarity index 100% rename from c/test/Makefile.am rename to c/reg_test/Makefile.am diff --git a/c/test/README.md b/c/reg_test/README.md similarity index 100% rename from c/test/README.md rename to c/reg_test/README.md diff --git a/c/test/expected/Makefile.am b/c/reg_test/expected/Makefile.am similarity index 100% rename from c/test/expected/Makefile.am rename to c/reg_test/expected/Makefile.am diff --git a/c/test/expected/out b/c/reg_test/expected/out similarity index 100% rename from c/test/expected/out rename to c/reg_test/expected/out diff --git a/c/test/input/Makefile.am b/c/reg_test/input/Makefile.am similarity index 100% rename from c/test/input/Makefile.am rename to c/reg_test/input/Makefile.am diff --git a/c/test/input/a.csv b/c/reg_test/input/a.csv similarity index 100% rename from c/test/input/a.csv rename to c/reg_test/input/a.csv diff --git a/c/test/input/a.pprint b/c/reg_test/input/a.pprint similarity index 100% rename from c/test/input/a.pprint rename to c/reg_test/input/a.pprint diff --git a/c/test/input/abixy b/c/reg_test/input/abixy similarity index 100% rename from c/test/input/abixy rename to c/reg_test/input/abixy diff --git a/c/test/input/abixy-wide b/c/reg_test/input/abixy-wide similarity index 100% rename from c/test/input/abixy-wide rename to c/reg_test/input/abixy-wide diff --git a/c/test/input/b.csv b/c/reg_test/input/b.csv similarity index 100% rename from c/test/input/b.csv rename to c/reg_test/input/b.csv diff --git a/c/test/input/b.pprint b/c/reg_test/input/b.pprint similarity index 100% rename from c/test/input/b.pprint rename to c/reg_test/input/b.pprint diff --git a/c/test/input/c.csv b/c/reg_test/input/c.csv similarity index 100% rename from c/test/input/c.csv rename to c/reg_test/input/c.csv diff --git a/c/test/input/c.pprint b/c/reg_test/input/c.pprint similarity index 100% rename from c/test/input/c.pprint rename to c/reg_test/input/c.pprint diff --git a/c/test/input/d.csv b/c/reg_test/input/d.csv similarity index 100% rename from c/test/input/d.csv rename to c/reg_test/input/d.csv diff --git a/c/test/input/d.pprint b/c/reg_test/input/d.pprint similarity index 100% rename from c/test/input/d.pprint rename to c/reg_test/input/d.pprint diff --git a/c/test/input/dots.pprint b/c/reg_test/input/dots.pprint similarity index 100% rename from c/test/input/dots.pprint rename to c/reg_test/input/dots.pprint diff --git a/c/test/input/dots.xtab b/c/reg_test/input/dots.xtab similarity index 100% rename from c/test/input/dots.xtab rename to c/reg_test/input/dots.xtab diff --git a/c/test/input/double-ps.dkvp b/c/reg_test/input/double-ps.dkvp similarity index 100% rename from c/test/input/double-ps.dkvp rename to c/reg_test/input/double-ps.dkvp diff --git a/c/test/input/e.csv b/c/reg_test/input/e.csv similarity index 100% rename from c/test/input/e.csv rename to c/reg_test/input/e.csv diff --git a/c/test/input/e.pprint b/c/reg_test/input/e.pprint similarity index 100% rename from c/test/input/e.pprint rename to c/reg_test/input/e.pprint diff --git a/c/test/input/f.csv b/c/reg_test/input/f.csv similarity index 100% rename from c/test/input/f.csv rename to c/reg_test/input/f.csv diff --git a/c/test/input/f.pprint b/c/reg_test/input/f.pprint similarity index 100% rename from c/test/input/f.pprint rename to c/reg_test/input/f.pprint diff --git a/c/test/input/fsec2xhms b/c/reg_test/input/fsec2xhms similarity index 100% rename from c/test/input/fsec2xhms rename to c/reg_test/input/fsec2xhms diff --git a/c/test/input/g.csv b/c/reg_test/input/g.csv similarity index 100% rename from c/test/input/g.csv rename to c/reg_test/input/g.csv diff --git a/c/test/input/g.pprint b/c/reg_test/input/g.pprint similarity index 100% rename from c/test/input/g.pprint rename to c/reg_test/input/g.pprint diff --git a/c/test/input/gmt2sec b/c/reg_test/input/gmt2sec similarity index 100% rename from c/test/input/gmt2sec rename to c/reg_test/input/gmt2sec diff --git a/c/test/input/het.csv b/c/reg_test/input/het.csv similarity index 100% rename from c/test/input/het.csv rename to c/reg_test/input/het.csv diff --git a/c/test/input/het.dkvp b/c/reg_test/input/het.dkvp similarity index 100% rename from c/test/input/het.dkvp rename to c/reg_test/input/het.dkvp diff --git a/c/test/input/joina.dkvp b/c/reg_test/input/joina.dkvp similarity index 100% rename from c/test/input/joina.dkvp rename to c/reg_test/input/joina.dkvp diff --git a/c/test/input/joinb.dkvp b/c/reg_test/input/joinb.dkvp similarity index 100% rename from c/test/input/joinb.dkvp rename to c/reg_test/input/joinb.dkvp diff --git a/c/test/input/minmax.dkvp b/c/reg_test/input/minmax.dkvp similarity index 100% rename from c/test/input/minmax.dkvp rename to c/reg_test/input/minmax.dkvp diff --git a/c/test/input/missings.dkvp b/c/reg_test/input/missings.dkvp similarity index 100% rename from c/test/input/missings.dkvp rename to c/reg_test/input/missings.dkvp diff --git a/c/test/input/multi-ips.dkvp b/c/reg_test/input/multi-ips.dkvp similarity index 100% rename from c/test/input/multi-ips.dkvp rename to c/reg_test/input/multi-ips.dkvp diff --git a/c/test/input/multi-sep.csvl b/c/reg_test/input/multi-sep.csvl similarity index 100% rename from c/test/input/multi-sep.csvl rename to c/reg_test/input/multi-sep.csvl diff --git a/c/test/input/multi-sep.dkvp b/c/reg_test/input/multi-sep.dkvp similarity index 100% rename from c/test/input/multi-sep.dkvp rename to c/reg_test/input/multi-sep.dkvp diff --git a/c/test/input/null-fields.csv b/c/reg_test/input/null-fields.csv similarity index 100% rename from c/test/input/null-fields.csv rename to c/reg_test/input/null-fields.csv diff --git a/c/test/input/null-fields.nidx b/c/reg_test/input/null-fields.nidx similarity index 100% rename from c/test/input/null-fields.nidx rename to c/reg_test/input/null-fields.nidx diff --git a/c/test/input/regularize.dkvp b/c/reg_test/input/regularize.dkvp similarity index 100% rename from c/test/input/regularize.dkvp rename to c/reg_test/input/regularize.dkvp diff --git a/c/test/input/rfc-csv/Makefile.am b/c/reg_test/input/rfc-csv/Makefile.am similarity index 100% rename from c/test/input/rfc-csv/Makefile.am rename to c/reg_test/input/rfc-csv/Makefile.am diff --git a/c/test/input/rfc-csv/modify-defaults.csv b/c/reg_test/input/rfc-csv/modify-defaults.csv similarity index 100% rename from c/test/input/rfc-csv/modify-defaults.csv rename to c/reg_test/input/rfc-csv/modify-defaults.csv diff --git a/c/test/input/rfc-csv/narrow-truncated.csv b/c/reg_test/input/rfc-csv/narrow-truncated.csv similarity index 100% rename from c/test/input/rfc-csv/narrow-truncated.csv rename to c/reg_test/input/rfc-csv/narrow-truncated.csv diff --git a/c/test/input/rfc-csv/narrow.csv b/c/reg_test/input/rfc-csv/narrow.csv similarity index 100% rename from c/test/input/rfc-csv/narrow.csv rename to c/reg_test/input/rfc-csv/narrow.csv diff --git a/c/test/input/rfc-csv/quoted-comma-truncated.csv b/c/reg_test/input/rfc-csv/quoted-comma-truncated.csv similarity index 100% rename from c/test/input/rfc-csv/quoted-comma-truncated.csv rename to c/reg_test/input/rfc-csv/quoted-comma-truncated.csv diff --git a/c/test/input/rfc-csv/quoted-comma.csv b/c/reg_test/input/rfc-csv/quoted-comma.csv similarity index 100% rename from c/test/input/rfc-csv/quoted-comma.csv rename to c/reg_test/input/rfc-csv/quoted-comma.csv diff --git a/c/test/input/rfc-csv/quoted-crlf-truncated.csv b/c/reg_test/input/rfc-csv/quoted-crlf-truncated.csv similarity index 100% rename from c/test/input/rfc-csv/quoted-crlf-truncated.csv rename to c/reg_test/input/rfc-csv/quoted-crlf-truncated.csv diff --git a/c/test/input/rfc-csv/quoted-crlf.csv b/c/reg_test/input/rfc-csv/quoted-crlf.csv similarity index 100% rename from c/test/input/rfc-csv/quoted-crlf.csv rename to c/reg_test/input/rfc-csv/quoted-crlf.csv diff --git a/c/test/input/rfc-csv/simple-truncated.csv b/c/reg_test/input/rfc-csv/simple-truncated.csv similarity index 100% rename from c/test/input/rfc-csv/simple-truncated.csv rename to c/reg_test/input/rfc-csv/simple-truncated.csv diff --git a/c/test/input/rfc-csv/simple.csv b/c/reg_test/input/rfc-csv/simple.csv similarity index 100% rename from c/test/input/rfc-csv/simple.csv rename to c/reg_test/input/rfc-csv/simple.csv diff --git a/c/test/input/sec2gmt b/c/reg_test/input/sec2gmt similarity index 100% rename from c/test/input/sec2gmt rename to c/reg_test/input/sec2gmt diff --git a/c/test/input/sec2xhms b/c/reg_test/input/sec2xhms similarity index 100% rename from c/test/input/sec2xhms rename to c/reg_test/input/sec2xhms diff --git a/c/test/input/short b/c/reg_test/input/short similarity index 100% rename from c/test/input/short rename to c/reg_test/input/short diff --git a/c/test/input/small b/c/reg_test/input/small similarity index 100% rename from c/test/input/small rename to c/reg_test/input/small diff --git a/c/test/input/space-pad.dkvp b/c/reg_test/input/space-pad.dkvp similarity index 100% rename from c/test/input/space-pad.dkvp rename to c/reg_test/input/space-pad.dkvp diff --git a/c/test/input/space-pad.nidx b/c/reg_test/input/space-pad.nidx similarity index 100% rename from c/test/input/space-pad.nidx rename to c/reg_test/input/space-pad.nidx diff --git a/c/test/input/space-pad.pprint b/c/reg_test/input/space-pad.pprint similarity index 100% rename from c/test/input/space-pad.pprint rename to c/reg_test/input/space-pad.pprint diff --git a/c/test/input/truncated.csv b/c/reg_test/input/truncated.csv similarity index 100% rename from c/test/input/truncated.csv rename to c/reg_test/input/truncated.csv diff --git a/c/test/input/truncated.dkvp b/c/reg_test/input/truncated.dkvp similarity index 100% rename from c/test/input/truncated.dkvp rename to c/reg_test/input/truncated.dkvp diff --git a/c/test/input/truncated.nidx b/c/reg_test/input/truncated.nidx similarity index 100% rename from c/test/input/truncated.nidx rename to c/reg_test/input/truncated.nidx diff --git a/c/test/input/truncated.pprint b/c/reg_test/input/truncated.pprint similarity index 100% rename from c/test/input/truncated.pprint rename to c/reg_test/input/truncated.pprint diff --git a/c/test/input/truncated.xtab b/c/reg_test/input/truncated.xtab similarity index 100% rename from c/test/input/truncated.xtab rename to c/reg_test/input/truncated.xtab diff --git a/c/test/input/truncated.xtab-crlf b/c/reg_test/input/truncated.xtab-crlf similarity index 100% rename from c/test/input/truncated.xtab-crlf rename to c/reg_test/input/truncated.xtab-crlf diff --git a/c/test/input/utf8-1.csv b/c/reg_test/input/utf8-1.csv similarity index 100% rename from c/test/input/utf8-1.csv rename to c/reg_test/input/utf8-1.csv diff --git a/c/test/input/utf8-2.csv b/c/reg_test/input/utf8-2.csv similarity index 100% rename from c/test/input/utf8-2.csv rename to c/reg_test/input/utf8-2.csv diff --git a/c/test/input/utf8-align.dkvp b/c/reg_test/input/utf8-align.dkvp similarity index 100% rename from c/test/input/utf8-align.dkvp rename to c/reg_test/input/utf8-align.dkvp diff --git a/c/test/input/utf8-align.nidx b/c/reg_test/input/utf8-align.nidx similarity index 100% rename from c/test/input/utf8-align.nidx rename to c/reg_test/input/utf8-align.nidx diff --git a/c/test/run b/c/reg_test/run similarity index 97% rename from c/test/run rename to c/reg_test/run index 988cb95be..fd636f9ec 100755 --- a/c/test/run +++ b/c/reg_test/run @@ -15,19 +15,19 @@ set -e # For building with autoconf: # * in-directory build: -# pwd is /path/to/the/tree/c/test -# path to mlr is /path/to/the/tree/c/mlr -# path to test/run is /path/to/the/tree/c/test/run +# pwd is /path/to/the/tree/c/reg_test +# path to mlr is /path/to/the/tree/c/mlr +# path to reg_test/run is /path/to/the/tree/c/reg_test/run # # * out-of-directory ("VPATH") build: -# pwd is /path/to/build/tree/c/test -# path to mlr is /path/to/build/tree/c/mlr -# path to test/run is /path/to/source/tree/c/test/run +# pwd is /path/to/build/tree/c/reg_test +# path to mlr is /path/to/build/tree/c/mlr +# path to reg_test/run is /path/to/source/tree/c/reg_test/run # For building without autoconf: -# pwd is /does/not/matter -# path to mlr is /path/to/the/tree/c/mlr -# path to test/run is /path/to/the/tree/c/test/run +# pwd is /does/not/matter +# path to mlr is /path/to/the/tree/c/mlr +# path to reg_test/run is /path/to/the/tree/c/reg_test/run ourdir=`dirname $0` srcdir=$ourdir/../..