Changeset 8731

Timestamp:

Sep 1, 2006, 2:41:47 PM (20 years ago)

Author:

jhoblitt

Message:

add libpstap under test/pstap
mv src/pstap.h -> test/pstap/src/pstap.h
mv duplicate mem() macro out of test/sys/tap_psStringSubstitute.c and into test/pstap/src/pstap.h (replacing the old mem())
change test/*/Makefile.am files to link against both libtap * libpstap
change test/*/tap_*.c files so that all tests include pslib.h
change test/*/tap_*.c files to include both tap.h & pstap.h
change libtap to only be built when make check is run

Location:

trunk/psLib

Files:

• configure.ac (modified) (1 diff)
• src/pstap.h (deleted)
• test/Makefile.am (modified) (1 diff)
• test/mathtypes/Makefile.am (modified) (1 diff)
• test/mathtypes/tap_psVector.c (modified) (1 diff)
• test/pstap (added)
• test/pstap/Makefile.am (added)
• test/pstap/src (added)
• test/pstap/src/Makefile.am (added)
• test/pstap/src/pstap.c (added)
• test/pstap/src/pstap.h (added)
• test/sys/Makefile.am (modified) (1 diff)
• test/sys/tap_psStringSubstitute.c (modified) (1 diff)
• test/tap/src/Makefile.am (modified) (1 diff)
• test/types/Makefile.am (modified) (1 diff)
• test/types/tap_psArray_all.c (modified) (1 diff)
• test/types/tap_psListIterator.c (modified) (1 diff)
• test/types/tap_psMetadataConfigParse.c (modified) (1 diff)
• test/types/tap_psMetadataItemCompare.c (modified) (1 diff)
• test/types/tap_psMetadataItemParse.c (modified) (1 diff)
• test/types/tap_psMetadataIterator.c (modified) (1 diff)
• test/types/tap_psMetadata_copying.c (modified) (1 diff)
• test/types/tap_psMetadata_creating.c (modified) (1 diff)
• test/types/tap_psMetadata_manip.c (modified) (1 diff)
• test/types/tap_psMetadata_polynomials.c (modified) (1 diff)
• test/types/tap_psMetadata_printing.c (modified) (1 diff)

trunk/psLib/configure.ac

@@ -415 +415 @@
   test/xml/Makefile
   test/FullUnitTest
+  test/pstap/Makefile
+  test/pstap/src/Makefile
   etc/pslib/Makefile
   etc/Makefile

trunk/psLib/test/Makefile.am

@@ -1 @@
-SUBDIRS = tap $(SRCDIRS)
+SUBDIRS = tap pstap $(SRCDIRS)
 
 TESTS = test.pl

trunk/psLib/test/mathtypes/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_CPPFLAGS = \
+        $(SRCINC) \
+        -I$(top_srcdir)/test/tap/src \
+        -I$(top_srcdir)/test/pstap/src \
+        $(PSLIB_CFLAGS)
 AM_LDFLAGS = \
         $(top_builddir)/src/libpslib.la  \
         $(top_builddir)/test/tap/src/libtap.la \
+        $(top_builddir)/test/pstap/src/libpstap.la \
         $(PSLIB_LIBS)
 

trunk/psLib/test/mathtypes/tap_psVector.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
 #include "tap.h"
+#include "pstap.h"
 
 int main (void)

trunk/psLib/test/sys/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_CPPFLAGS = \
+        $(SRCINC) \
+        -I$(top_srcdir)/test/tap/src \
+        -I$(top_srcdir)/test/pstap/src \
+        $(PSLIB_CFLAGS)
 AM_LDFLAGS = \
         $(top_builddir)/src/libpslib.la  \
         $(top_builddir)/test/tap/src/libtap.la \
+        $(top_builddir)/test/pstap/src/libpstap.la \
         $(PSLIB_LIBS)
+
 
 check_PROGRAMS = \

trunk/psLib/test/sys/tap_psStringSubstitute.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
 #include "tap.h"
+#include "pstap.h"
 
 #define ORIGINAL "This is, a, test case, to check."
 #define CORRECTED "This is a test case to check."
-#define mem() ok(psMemCheckLeaks(psMemGetLastId(), NULL, stdout, false) == 0, "Memory Leaks")
 
 int main (void)

trunk/psLib/test/tap/src/Makefile.am

@@ -1 @@
-lib_LTLIBRARIES = libtap.la
+check_LTLIBRARIES = libtap.la
 libtap_la_SOURCES = tap.c tap.h
 

trunk/psLib/test/types/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS) 
+AM_CPPFLAGS = \
+        $(SRCINC) \
+        -I$(top_srcdir)/test/tap/src \
+        -I$(top_srcdir)/test/pstap/src \
+        $(PSLIB_CFLAGS) 
 AM_LDFLAGS = \
         $(top_builddir)/src/libpslib.la  \
         $(top_builddir)/test/tap/src/libtap.la \
+        $(top_builddir)/test/pstap/src/libpstap.la \
         $(PSLIB_LIBS) 
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""

trunk/psLib/test/types/tap_psArray_all.c

@@ -12 +12 @@
  */
 
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psListIterator.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
 #include "tap.h"
+#include "pstap.h"
 
 #define STRING1 "This is string #1"

trunk/psLib/test/types/tap_psMetadataConfigParse.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
 #include "tap.h"
+#include "pstap.h"
 
 #define FILENAME "tap_psMetadataConfigParse.config"

trunk/psLib/test/types/tap_psMetadataItemCompare.c

@@ -1 @@
-
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadataItemParse.c

@@ -1 @@
-
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadataIterator.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
 #include "tap.h"
+#include "pstap.h"
 
 

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -11 +11 @@
  */
 
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadata_creating.c

@@ -13 +13 @@
 */
 
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadata_manip.c

@@ -11 +11 @@
  */
 
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadata_polynomials.c

@@ -11 +11 @@
  */
 
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"
 

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -12 +12 @@
 
 #include <fcntl.h>
+#include <pslib.h>
+
+#include "tap.h"
 #include "pstap.h"