From 166846fa5a2df6121bd5991659fd85ece967240f Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 27 Feb 2024 21:15:41 -0500 Subject: [PATCH] Move test SQL files to subdir --- Makefile.am | 48 +++++++++---------- test-fail.sh | 2 +- test-ok.sh | 2 +- test-tst.sh | 2 +- fail1.sql => tests/fail1.sql | 0 fail3.sql => tests/fail3.sql | 0 fail4.sql => tests/fail4.sql | 0 fail5.sql => tests/fail5.sql | 0 ok1.sql => tests/ok1.sql | 0 ok10.sql => tests/ok10.sql | 0 ok2.sql => tests/ok2.sql | 0 ok3.sql => tests/ok3.sql | 0 ok4.sql => tests/ok4.sql | 0 ok5.sql => tests/ok5.sql | 0 ok6.sql => tests/ok6.sql | 0 ok7.sql => tests/ok7.sql | 0 ok8.sql => tests/ok8.sql | 0 ok9.sql => tests/ok9.sql | 0 tst-create-db.sql => tests/tst-create-db.sql | 0 .../tst-create-table.sql | 0 tst-delete.sql => tests/tst-delete.sql | 0 tst-drop-db.sql => tests/tst-drop-db.sql | 0 .../tst-drop-table.sql | 0 tst-insert.sql => tests/tst-insert.sql | 0 .../tst-select-null.sql | 0 .../tst-select-null2.sql | 0 .../tst-select-null3.sql | 0 xfail2.sql => tests/xfail2.sql | 0 28 files changed, 27 insertions(+), 27 deletions(-) rename fail1.sql => tests/fail1.sql (100%) rename fail3.sql => tests/fail3.sql (100%) rename fail4.sql => tests/fail4.sql (100%) rename fail5.sql => tests/fail5.sql (100%) rename ok1.sql => tests/ok1.sql (100%) rename ok10.sql => tests/ok10.sql (100%) rename ok2.sql => tests/ok2.sql (100%) rename ok3.sql => tests/ok3.sql (100%) rename ok4.sql => tests/ok4.sql (100%) rename ok5.sql => tests/ok5.sql (100%) rename ok6.sql => tests/ok6.sql (100%) rename ok7.sql => tests/ok7.sql (100%) rename ok8.sql => tests/ok8.sql (100%) rename ok9.sql => tests/ok9.sql (100%) rename tst-create-db.sql => tests/tst-create-db.sql (100%) rename tst-create-table.sql => tests/tst-create-table.sql (100%) rename tst-delete.sql => tests/tst-delete.sql (100%) rename tst-drop-db.sql => tests/tst-drop-db.sql (100%) rename tst-drop-table.sql => tests/tst-drop-table.sql (100%) rename tst-insert.sql => tests/tst-insert.sql (100%) rename tst-select-null.sql => tests/tst-select-null.sql (100%) rename tst-select-null2.sql => tests/tst-select-null2.sql (100%) rename tst-select-null3.sql => tests/tst-select-null3.sql (100%) rename xfail2.sql => tests/xfail2.sql (100%) diff --git a/Makefile.am b/Makefile.am index 2efe8e6..141344d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,30 +13,30 @@ pkgconfig_DATA = libsqlpars.pc EXTRA_DIST = sql.y sql.l \ pscan.js \ test-ok.sh test-tst.sh test-fail.sh \ - fail1.sql \ - fail3.sql \ - fail4.sql \ - fail5.sql \ - xfail2.sql \ - ok1.sql \ - ok2.sql \ - ok3.sql \ - ok4.sql \ - ok5.sql \ - ok6.sql \ - ok7.sql \ - ok8.sql \ - ok9.sql \ - ok10.sql \ - tst-create-db.sql \ - tst-create-table.sql \ - tst-delete.sql \ - tst-drop-db.sql \ - tst-drop-table.sql \ - tst-insert.sql \ - tst-select-null.sql \ - tst-select-null2.sql \ - tst-select-null3.sql + tests/fail1.sql \ + tests/fail3.sql \ + tests/fail4.sql \ + tests/fail5.sql \ + tests/xfail2.sql \ + tests/ok1.sql \ + tests/ok2.sql \ + tests/ok3.sql \ + tests/ok4.sql \ + tests/ok5.sql \ + tests/ok6.sql \ + tests/ok7.sql \ + tests/ok8.sql \ + tests/ok9.sql \ + tests/ok10.sql \ + tests/tst-create-db.sql \ + tests/tst-create-table.sql \ + tests/tst-delete.sql \ + tests/tst-drop-db.sql \ + tests/tst-drop-table.sql \ + tests/tst-insert.sql \ + tests/tst-select-null.sql \ + tests/tst-select-null2.sql \ + tests/tst-select-null3.sql sql_SOURCES = exec.c lib.c main.c sql-parser.h yyl.h sql_LDADD = @JANSSON_LIBS@ diff --git a/test-fail.sh b/test-fail.sh index b8b2294..3aa4384 100755 --- a/test-fail.sh +++ b/test-fail.sh @@ -1,6 +1,6 @@ #!/bin/sh -for testfn in $srcdir/fail*.sql +for testfn in $srcdir/tests/fail*.sql do cat $testfn | ./sql if [ $? -ne 1 ] diff --git a/test-ok.sh b/test-ok.sh index 8ab6e5d..2ad01b8 100755 --- a/test-ok.sh +++ b/test-ok.sh @@ -1,6 +1,6 @@ #!/bin/sh -for testfn in $srcdir/ok*.sql +for testfn in $srcdir/tests/ok*.sql do cat $testfn | ./sql if [ $? -ne 0 ] diff --git a/test-tst.sh b/test-tst.sh index ada404a..b88566f 100755 --- a/test-tst.sh +++ b/test-tst.sh @@ -1,6 +1,6 @@ #!/bin/sh -for testfn in $srcdir/tst-*.sql +for testfn in $srcdir/tests/tst-*.sql do cat $testfn | ./sql if [ $? -ne 0 ] diff --git a/fail1.sql b/tests/fail1.sql similarity index 100% rename from fail1.sql rename to tests/fail1.sql diff --git a/fail3.sql b/tests/fail3.sql similarity index 100% rename from fail3.sql rename to tests/fail3.sql diff --git a/fail4.sql b/tests/fail4.sql similarity index 100% rename from fail4.sql rename to tests/fail4.sql diff --git a/fail5.sql b/tests/fail5.sql similarity index 100% rename from fail5.sql rename to tests/fail5.sql diff --git a/ok1.sql b/tests/ok1.sql similarity index 100% rename from ok1.sql rename to tests/ok1.sql diff --git a/ok10.sql b/tests/ok10.sql similarity index 100% rename from ok10.sql rename to tests/ok10.sql diff --git a/ok2.sql b/tests/ok2.sql similarity index 100% rename from ok2.sql rename to tests/ok2.sql diff --git a/ok3.sql b/tests/ok3.sql similarity index 100% rename from ok3.sql rename to tests/ok3.sql diff --git a/ok4.sql b/tests/ok4.sql similarity index 100% rename from ok4.sql rename to tests/ok4.sql diff --git a/ok5.sql b/tests/ok5.sql similarity index 100% rename from ok5.sql rename to tests/ok5.sql diff --git a/ok6.sql b/tests/ok6.sql similarity index 100% rename from ok6.sql rename to tests/ok6.sql diff --git a/ok7.sql b/tests/ok7.sql similarity index 100% rename from ok7.sql rename to tests/ok7.sql diff --git a/ok8.sql b/tests/ok8.sql similarity index 100% rename from ok8.sql rename to tests/ok8.sql diff --git a/ok9.sql b/tests/ok9.sql similarity index 100% rename from ok9.sql rename to tests/ok9.sql diff --git a/tst-create-db.sql b/tests/tst-create-db.sql similarity index 100% rename from tst-create-db.sql rename to tests/tst-create-db.sql diff --git a/tst-create-table.sql b/tests/tst-create-table.sql similarity index 100% rename from tst-create-table.sql rename to tests/tst-create-table.sql diff --git a/tst-delete.sql b/tests/tst-delete.sql similarity index 100% rename from tst-delete.sql rename to tests/tst-delete.sql diff --git a/tst-drop-db.sql b/tests/tst-drop-db.sql similarity index 100% rename from tst-drop-db.sql rename to tests/tst-drop-db.sql diff --git a/tst-drop-table.sql b/tests/tst-drop-table.sql similarity index 100% rename from tst-drop-table.sql rename to tests/tst-drop-table.sql diff --git a/tst-insert.sql b/tests/tst-insert.sql similarity index 100% rename from tst-insert.sql rename to tests/tst-insert.sql diff --git a/tst-select-null.sql b/tests/tst-select-null.sql similarity index 100% rename from tst-select-null.sql rename to tests/tst-select-null.sql diff --git a/tst-select-null2.sql b/tests/tst-select-null2.sql similarity index 100% rename from tst-select-null2.sql rename to tests/tst-select-null2.sql diff --git a/tst-select-null3.sql b/tests/tst-select-null3.sql similarity index 100% rename from tst-select-null3.sql rename to tests/tst-select-null3.sql diff --git a/xfail2.sql b/tests/xfail2.sql similarity index 100% rename from xfail2.sql rename to tests/xfail2.sql