X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=0ea5de5cf58f97f8f135cb491d03644f6f54a34b;hb=c58173ea116eed59ce96a4b233f2d2d8ceb50b26;hp=8be58e18f55fed21792b3861668de8d110f0162c;hpb=714ea20439a47287d31820eb71ef77e01a465d86;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 8be58e18..0ea5de5c 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -2,7 +2,9 @@
 
 check_PROGRAMS += \
 	tests/data/datasheet-test \
+	tests/data/sack \
 	tests/data/inexactify \
+	tests/language/lexer/command-name-test \
 	tests/libpspp/abt-test \
 	tests/libpspp/bt-test \
 	tests/libpspp/heap-test \
@@ -28,6 +30,11 @@ tests_data_datasheet_test_SOURCES = \
 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
@@ -181,6 +188,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 = \
@@ -224,6 +242,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 \
@@ -257,6 +276,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 \
@@ -328,7 +348,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:
@@ -337,7 +357,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.