Changeset 3662

Timestamp:

Apr 5, 2005, 9:37:03 AM (21 years ago)

Author:

desonia

Message:

made testing of psDB optional, depending if feature is enabled.

Location:

trunk/psLib

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• pslib.kdevelop.pcs (modified) ( previous)
• pslib.kdevses (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/astronomy/Makefile.am (modified) (4 diffs)

trunk/psLib/Makefile.am

@@ -1 @@
-SUBDIRS = $(SUBDIR) 
+SUBDIRS = $(SUBDIR)
 
 bin_SCRIPTS = pslib-config

trunk/psLib/configure.ac

@@ -75 +75 @@
   AC_MSG_RESULT([${MYSQL_LDFLAGS}])
   PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"
-
+  AC_SUBST(TST_PSDB,"tst_psDB") dnl enable the test for psDB
+  
   AC_RUN_IFELSE([AC_LANG_PROGRAM(
 [[#include <stdlib.h>

trunk/psLib/pslib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="9" >
+ <DocsAndViews NumberOfDocuments="4" >
   <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/fileUtils/psFits.h" >
-   <View0 line="220" Type="Source" />
+   <View0 Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/collections/Makefile.am" >
-   <View0 line="60" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/fileUtils/psFits.c" >
+   <View0 line="538" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/dataManip/Makefile.am" >
-   <View0 line="116" Type="Source" />
+  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/fileUtils/tst_psFits.c" >
+   <View0 line="647" Type="Source" />
   </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/astronomy/Makefile.am" >
-   <View0 line="108" Type="Source" />
+  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/astronomy/psMetadata.h" >
+   <View0 line="76" Type="Source" />
   </Doc3>
-  <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/fileUtils/Makefile.am" >
-   <View0 line="38" Type="Source" />
-  </Doc4>
-  <Doc5 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/Makefile.am" >
-   <View0 line="32" Type="Source" />
-  </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/Makefile.am" >
-   <View0 line="8" Type="Source" />
-  </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/image/Makefile.am" >
-   <View0 line="62" Type="Source" />
-  </Doc7>
-  <Doc8 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/sysUtils/Makefile.am" >
-   <View0 line="44" Type="Source" />
-  </Doc8>
  </DocsAndViews>
  <pluginList>

trunk/psLib/test/Makefile.am

@@ -8 +8 @@
 
 test: check
+
+tests:

trunk/psLib/test/astronomy/Makefile.am

@@ -13 +13 @@
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
-  
 
 TESTS = tst_psTime_01 \
@@ -19 +18 @@
          tst_psTime_03 \
          tst_psTime_04 \
-         tst_psDB \
          tst_psMetadataIO  \
          tst_psMetadata_01 \
@@ -30 +28 @@
          tst_psCoord \
          tst_psCoord01 \
+         @TST_PSDB@ \
          tst_psAstrometry \
          tst_psAstrometry01
@@ -46 +45 @@
 
 TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
- 
+
+EXTRA_PROGRAMS = tst_psDB
 
 tests: $(check_DATA) $(TESTS)