X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=3bb36e5152dbc7962aa2b081696a71916cd2458d;hb=ad05a0285feaa0faa4e1329b8ee985c2ce17b1c9;hp=14d8569f02a9790cd81e8a6c959870461d9dca14;hpb=72b213bf051455a1144ffe58f6d95d77afd558d1;p=pspp-builds.git diff --git a/tests/automake.mk b/tests/automake.mk index 14d8569f..3bb36e51 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -1,32 +1,10 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)' -TESTS_ENVIRONMENT += PERL='$(PERL)' - -# Allow locale_charset to find charset.alias before running "make install". -TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl' - -TESTS_ENVIRONMENT += LC_ALL=C -TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT) - -dist_TESTS = \ - tests/formats/date-in.sh \ - tests/formats/ib-in.sh \ - tests/formats/legacy-in.sh \ - tests/formats/month-in.sh \ - tests/formats/num-in.sh \ - tests/formats/num-out.sh \ - tests/formats/time-in.sh \ - tests/formats/wkday-in.sh \ - tests/formats/wkday-out.sh \ - tests/formats/360.sh - -TESTS = $(dist_TESTS) $(nodist_TESTS) - check_PROGRAMS += \ - $(nodist_TESTS) \ tests/data/datasheet-test \ - tests/formats/inexactify \ + tests/data/sack \ + tests/data/inexactify \ + tests/language/lexer/command-name-test \ tests/libpspp/abt-test \ tests/libpspp/bt-test \ tests/libpspp/heap-test \ @@ -47,11 +25,18 @@ check_PROGRAMS += \ tests/libpspp/tower-test \ tests/output/render-test +check-programs: $(check_PROGRAMS) + tests_data_datasheet_test_SOURCES = \ tests/data/datasheet-test.c tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) +tests_data_sack_SOURCES = \ + tests/data/sack.c +tests_data_sack_LDADD = src/libpspp-core.la $(LIBINTL) +tests_data_sack_CFLAGS = $(AM_CFLAGS) + tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ tests/libpspp/ll-test.c @@ -195,7 +180,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 -tests_formats_inexactify_SOURCES = tests/formats/inexactify.c +tests_data_inexactify_SOURCES = tests/data/inexactify.c noinst_PROGRAMS += tests/dissect-sysfile tests_dissect_sysfile_SOURCES = \ @@ -205,6 +190,17 @@ tests_dissect_sysfile_SOURCES = \ tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" +check_PROGRAMS += tests/language/lexer/command-name-test +tests_language_lexer_command_name_test_SOURCES = \ + src/data/identifier.c \ + src/language/lexer/command-name.c \ + tests/language/lexer/command-name-test.c +tests_language_lexer_command_name_test_LDADD = \ + src/libpspp/libpspp.la \ + gl/libgl.la \ + $(LIBINTL) +tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) + check_PROGRAMS += tests/output/render-test tests_output_render_test_SOURCES = tests/output/render-test.c tests_output_render_test_LDADD = \ @@ -215,32 +211,20 @@ tests_output_render_test_LDADD = \ $(LIBINTL) EXTRA_DIST += \ - $(dist_TESTS) \ - tests/coverage.sh tests/test_template \ + tests/coverage.sh \ tests/data/bcd-in.expected.cmp.gz \ + tests/data/binhex-in.expected.cmp.gz \ + tests/data/binhex-out.expected.gz \ + tests/data/legacy-in.expected.cmp.gz \ + tests/data/num-in.expected.gz \ + tests/data/num-out-cmp.pl \ + tests/data/num-out.expected.cmp.gz \ tests/data/v13.sav \ tests/data/v14.sav \ - tests/formats/binhex-out.expected.gz \ - tests/formats/ib-in.expected.cmp.gz \ - tests/formats/legacy-in.expected.cmp.gz \ - tests/formats/num-in.expected.gz \ - tests/formats/num-out.expected.cmp.gz \ - tests/formats/num-out-cmp.pl \ - tests/formats/num-out-compare.pl \ - tests/formats/num-out-decmp.pl \ - tests/formats/num-out.pl \ tests/language/data-io/Book1.gnm.unzipped CLEANFILES += *.save pspp.* foo* -check-for-export-var-val: - @if grep -q 'export .*=' $(dist_TESTS) ; then \ - echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \ - false ; \ - fi - -DIST_HOOKS += check-for-export-var-val - EXTRA_DIST += tests/OChangeLog # Autotest testsuite @@ -260,6 +244,7 @@ TESTSUITE_AT = \ tests/data/datasheet-test.at \ tests/data/format-guesser.at \ tests/data/por-file.at \ + tests/data/sys-file-reader.at \ tests/data/sys-file.at \ tests/language/command.at \ tests/language/control/do-if.at \ @@ -293,6 +278,7 @@ TESTSUITE_AT = \ tests/language/dictionary/weight.at \ tests/language/expressions/evaluate.at \ tests/language/expressions/parse.at \ + tests/language/lexer/command-name.at \ tests/language/lexer/lexer.at \ tests/language/lexer/q2c.at \ tests/language/lexer/variable-parser.at \ @@ -313,6 +299,7 @@ TESTSUITE_AT = \ tests/language/stats/roc.at \ tests/language/stats/sort-cases.at \ tests/language/stats/t-test.at \ + tests/language/utilities/cache.at \ tests/language/utilities/date.at \ tests/language/utilities/insert.at \ tests/language/utilities/permissions.at \ @@ -363,7 +350,7 @@ EXTRA_DIST += tests/testsuite.at CHECK_LOCAL += tests_check tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) - $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS) CLEAN_LOCAL += tests_clean tests_clean: @@ -372,7 +359,7 @@ tests_clean: AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) - $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + $(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp mv $@.tmp $@ # The `:;' works around a Bash 3.2 bug when the output is not writeable.