1 files changed, 68 insertions, 3 deletions
diff --git a/lib/libXmu/test/Makefile.am b/lib/libXmu/test/Makefile.am
index 955c0a6a4..f15fc0eac 100644
--- a/lib/libXmu/test/Makefile.am
+++ b/lib/libXmu/test/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,10 +21,75 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+
 AM_CPPFLAGS = -D_CONST_X_STRING -I${top_srcdir}/include
+AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS) $(GLIB_CFLAGS)
+
+XMU_TEST_LIBS  = ${top_builddir}/src/libXmu.la $(XMU_LIBS) $(GLIB_LIBS)
+XMUU_TEST_LIBS = ${top_builddir}/src/libXmuu.la $(XMUU_LIBS) $(GLIB_LIBS)
 
-check_PROGRAMS = EditResStream
+check_PROGRAMS = \
+        CursorName \
+        EditResStream \
+        Lower \
+        ReadBitmapData \
+        reallocarray \
+        StrToBS \
+        StrToGrav \
+        StrToJust \
+        StrToLong \
+        StrToOrnt \
+        StrToShap
 TESTS = $(check_PROGRAMS)
 
+TESTS_ENVIRONMENT = $(MALLOC_DEBUG_ENV)
+TESTS_ENVIRONMENT += G_TEST_SRCDIR="$(abs_srcdir)"
+TESTS_ENVIRONMENT += G_TEST_BUILDDIR="$(abs_builddir)"
+
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+                  $(top_srcdir)/tap-driver.sh
+LOG_COMPILER = $(srcdir)/tap-test
+
+CursorName_SOURCES = CursorName.c
+CursorName_LDADD = $(XMUU_TEST_LIBS)
+
 EditResStream_SOURCES = EditResStream.c
-EditResStream_LDADD = ${top_builddir}/src/libXmu.la $(XMU_LIBS)
+EditResStream_LDADD = $(XMU_TEST_LIBS)
+
+Lower_SOURCES = Lower.c
+Lower_LDADD = $(XMUU_TEST_LIBS)
+
+ReadBitmapData_SOURCES = ReadBitmapData.c
+ReadBitmapData_LDADD = $(XMU_TEST_LIBS)
+
+reallocarray_SOURCES = reallocarray.c
+reallocarray_LDADD = $(GLIB_LIBS)
+
+StrToBS_SOURCES = StrToBS.c
+StrToBS_LDADD = $(XMU_TEST_LIBS)
+
+StrToGrav_SOURCES = StrToGrav.c
+StrToGrav_LDADD = $(XMU_TEST_LIBS)
+
+StrToJust_SOURCES = StrToJust.c
+StrToJust_LDADD = $(XMU_TEST_LIBS)
+
+StrToLong_SOURCES = StrToLong.c
+StrToLong_LDADD = $(XMU_TEST_LIBS)
+
+StrToOrnt_SOURCES = StrToOrnt.c
+StrToOrnt_LDADD = $(XMU_TEST_LIBS)
+
+StrToShap_SOURCES = StrToShap.c
+StrToShap_LDADD = $(XMU_TEST_LIBS)
+
+endif HAVE_GLIB
+endif ENABLE_UNIT_TESTS
+
+EXTRA_DIST = \
+        bitmaps/plaid \
+        bitmaps/star \
+        bitmaps/xlogo64 \
+        tap-test