X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=082889cdedfe26d098dff3a4c9bd9196a59c7fe4;hb=f3fb5df541147f31335d86850d5f4dd2568c5c72;hp=00afa19757342a935c51111bcd0d1e510e86abde;hpb=502855f1d746c4acf920006326daa8c86a561a5b;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 00afa19757..082889cded 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -6,8 +6,11 @@ TESTS_ENVIRONMENT += PERL='@PERL@' PG_CONFIG='@PG_CONFIG@'
 # Allow locale_charset to find charset.alias before running "make install".
 TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
 
+TESTS_ENVIRONMENT += LC_ALL=C
+
 dist_TESTS = \
 	tests/command/aggregate.sh \
+	tests/command/attributes.sh \
 	tests/command/autorecod.sh \
 	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
@@ -170,6 +173,8 @@ nodist_TESTS = \
 	tests/libpspp/abt-test \
 	tests/libpspp/bt-test \
 	tests/libpspp/heap-test \
+	tests/libpspp/hmap-test \
+	tests/libpspp/hmapx-test \
 	tests/libpspp/ll-test \
 	tests/libpspp/llx-test \
 	tests/libpspp/range-map-test \
@@ -189,6 +194,7 @@ tests_libpspp_ll_test_SOURCES = \
 	src/libpspp/ll.h \
 	tests/libpspp/ll-test.c
 tests_libpspp_ll_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_llx_test_SOURCES = \
 	src/libpspp/ll.c \
@@ -197,6 +203,7 @@ tests_libpspp_llx_test_SOURCES = \
 	src/libpspp/llx.h \
 	tests/libpspp/llx-test.c
 tests_libpspp_llx_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.c \
@@ -207,6 +214,22 @@ tests_libpspp_heap_test_SOURCES = \
 tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_hmap_test_SOURCES = \
+	src/libpspp/hmap.c \
+	src/libpspp/hmap.h \
+	tests/libpspp/hmap-test.c
+tests_libpspp_hmap_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_hmapx_test_SOURCES = \
+	src/libpspp/hmap.c \
+	src/libpspp/hmap.h \
+	src/libpspp/hmapx.c \
+	src/libpspp/hmapx.h \
+	tests/libpspp/hmapx-test.c
+tests_libpspp_hmapx_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_abt_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
@@ -243,7 +266,7 @@ tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_str_test_SOURCES = \
 	tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = src/libpspp/libpspp.a gl/libgl.la @LIBINTL@
+tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la @LIBINTL@
 
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
@@ -273,6 +296,7 @@ tests_dissect_sysfile_SOURCES = \
 	src/libpspp/float-format.c \
 	tests/dissect-sysfile.c
 tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@
+tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
 EXTRA_DIST += \
 	$(dist_TESTS) \