X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=dcfbf2335df87f99560823510504d3f20b9a0e71;hb=02b539a8876795a0fb9cb747e297eb825a2b2747;hp=8a974a32f7033545d91cd075b8c879180a7c7eed;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 8a974a32..dcfbf233 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -194,6 +194,8 @@ nodist_TESTS = \
 	tests/libpspp/range-set-test \
 	tests/libpspp/sparse-array-test \
 	tests/libpspp/str-test \
+	tests/libpspp/string-map-test \
+	tests/libpspp/string-set-test \
 	tests/libpspp/tower-test
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -202,7 +204,8 @@ check_PROGRAMS += \
 	$(nodist_TESTS) \
 	tests/data/datasheet-test \
 	tests/formats/inexactify \
-	tests/libpspp/sparse-xarray-test
+	tests/libpspp/sparse-xarray-test \
+	tests/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
 	tests/data/datasheet-test.c
@@ -288,6 +291,23 @@ tests_libpspp_str_test_SOURCES = \
 	tests/libpspp/str-test.c
 tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) 
 
+tests_libpspp_string_map_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/string-map.c \
+	src/libpspp/string-set.c \
+	tests/libpspp/string-map-test.c
+tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_string_set_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/string-set.c \
+	tests/libpspp/string-set-test.c
+tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
@@ -333,6 +353,15 @@ tests_dissect_sysfile_SOURCES = \
 tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) 
 tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
+check_PROGRAMS += tests/output/render-test
+tests_output_render_test_SOURCES = tests/output/render-test.c
+tests_output_render_test_LDADD = \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	$(CAIRO_LIBS) \
+	$(LIBICONV) \
+	$(LIBINTL)
+
 EXTRA_DIST += \
 	$(dist_TESTS) \
         tests/Book1.gnm.unzipped \
@@ -340,9 +369,6 @@ EXTRA_DIST += \
 	tests/no_case_size.sav \
 	tests/coverage.sh tests/test_template \
 	tests/v13.sav tests/v14.sav \
-	tests/bugs/computebug.stat tests/bugs/computebug.out \
-	tests/bugs/recode-copy-bug-1.stat tests/bugs/recode-copy-bug-2.stat \
-	tests/bugs/recode-copy-bug-1.out tests/bugs/recode-copy-bug-2.out \
 	tests/expressions/randist/beta.out \
 	tests/expressions/randist/cauchy.out \
 	tests/expressions/randist/chisq.out \
@@ -382,3 +408,43 @@ check-for-export-var-val:
 DIST_HOOKS += check-for-export-var-val
 
 EXTRA_DIST += tests/OChangeLog
+
+# Autotest testsuite
+
+EXTRA_DIST += \
+	$(TESTSUITE_AT) \
+	$(TESTSUITE) \
+	tests/atlocal.in \
+	$(srcdir)/package.m4 \
+	$(TESTSUITE)
+TESTSUITE_AT = \
+	tests/testsuite.at \
+	tests/output/render.at
+TESTSUITE = $(srcdir)/tests/testsuite
+DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
+
+CHECK_LOCAL += tests_check
+tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output $(TESTSUITEFLAGS)
+
+CLEAN_LOCAL += tests_clean
+tests_clean:
+	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
+
+AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	mv $@.tmp $@
+
+# The `:;' works around a Bash 3.2 bug when the output is not writeable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+	  echo '# Signature of the current package.' && \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
+	  echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
+	} >'$(srcdir)/package.m4'