Changeset 11550

Timestamp:

Feb 1, 2007, 12:00:37 PM (19 years ago)

Author:

jhoblitt

Message:

distcheck fixes

Location:

trunk/psModules

Files:

• src/config/Makefile.am (modified) (1 diff)
• test/detrend/tap_pmShutterCorrection.c (modified) (11 diffs)
• test/tap/Makefile.am (modified) (1 diff)
• test/tap/configure.in (modified) (2 diffs)
• test/tap/src/tap.c (modified) (1 diff)

trunk/psModules/src/config/Makefile.am

@@ -28 +28 @@
 pmErrorCodes.c : pmErrorCodes.dat pmErrorCodes.c.in pmErrorCodes.h
         $(ERRORCODES) --data=pmErrorCodes.dat --outdir=. pmErrorCodes.c
+
+EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

trunk/psModules/test/detrend/tap_pmShutterCorrection.c

@@ -16 +16 @@
     {
         psMemId id = psMemGetId();
-        pmShutterCorrPars *pars = pmShutterCorrParsAlloc ();
+        pmShutterCorrection *pars = pmShutterCorrectionAlloc ();
 
         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
@@ -44 +44 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
 
         ok(pars != NULL, "pmShutterCorrPars successfully allocated");
@@ -81 +81 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
-
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
+
+        ok(pars != NULL, "pmShutterCorrection successfully allocated");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
 
         // with fine linearly-spaced times large compared to TO and TK,
@@ -118 +118 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrectionsuccessfully allocated");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale guess is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset guess is close enough (got %f vs %f)", pars->offset, TK);
@@ -154 +154 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
-
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
+
+        ok(pars != NULL, "pmShutterCorrection successfully allocated");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
 
         // with coarse linearly-spaced times large compared to TO and TK,
@@ -191 +191 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
-
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
+
+        ok(pars != NULL, "pmShutterCorrection successfully allocated");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionsAlloc() failed");
 
         // with fine linearly-spaced times large compared to TO and TK,
@@ -228 +228 @@
         }
 
-        pmShutterCorrPars *pars = pmShutterCorrectionGuess (exptime, counts);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionGuess (exptime, counts);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrection successfully allocated");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale guess is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset guess is close enough (got %f vs %f)", pars->offset, TK);
@@ -266 +266 @@
         }
 
-        pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
+        pmShutterCorrection *guess = pmShutterCorrectionGuess (exptime, counts);
         skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
-        pmShutterCorrPars *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionsAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
@@ -310 +310 @@
         }
 
-        pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
+        pmShutterCorrection*guess = pmShutterCorrectionGuess (exptime, counts);
         skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
-        pmShutterCorrPars *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *pars = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
@@ -356 +356 @@
         }
 
-        pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
+        pmShutterCorrection*guess = pmShutterCorrectionGuess (exptime, counts);
         skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
-        pmShutterCorrPars *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
-        pmShutterCorrPars *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, full->offref);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
+        pmShutterCorrection *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, NULL, full->offref, 1, 5, 0);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);
@@ -402 +402 @@
         }
 
-        pmShutterCorrPars *guess = pmShutterCorrectionGuess (exptime, counts);
+        pmShutterCorrection *guess = pmShutterCorrectionGuess (exptime, counts);
         skip_start(guess == NULL, 0, "Skipping tests because pmShutterCorrectionGuess() failed");
-        pmShutterCorrPars *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
-        pmShutterCorrPars *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, full->offref);
-
-        // with fine log-spaced times well-sampling TO and TK,
-        // we can expect accurate guesses
-        ok(pars != NULL, "pmShutterCorrPars successfully allocated by FullFit");
-        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed");
+        pmShutterCorrection *full = pmShutterCorrectionFullFit (exptime, counts, cntErr, guess);
+        pmShutterCorrection *pars = pmShutterCorrectionLinFit (exptime, counts, cntErr, NULL, full->offref, 1, 5, 0);
+
+        // with fine log-spaced times well-sampling TO and TK,
+        // we can expect accurate guesses
+        ok(pars != NULL, "pmShutterCorrection successfully allocated by FullFit");
+        skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrectionAlloc() failed");
         ok(fabs(pars->scale  - AK) < 0.01, "scale fit is close enough (got %f vs %f)",  pars->scale, AK);
         ok(fabs(pars->offset - TK) < 0.01, "offset fit is close enough (got %f vs %f)", pars->offset, TK);

trunk/psModules/test/tap/Makefile.am

@@ -1 @@
-SUBDIRS  = src tests
+SUBDIRS  = src
+#SUBDIRS += tests
 
 prove:

trunk/psModules/test/tap/configure.in

@@ -3 +3 @@
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_HEADERS([src/config.h])
+AC_GNU_SOURCE
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -40 +41 @@
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 tests/Makefile
-                 tests/diag/Makefile
-                 tests/fail/Makefile
-                 tests/ok/Makefile
-                 tests/ok/ok-hash/Makefile
-                 tests/ok/ok-numeric/Makefile
-                 tests/ok/ok/Makefile
-                 tests/pass/Makefile
-                 tests/plan/Makefile
-                 tests/plan/no-tests/Makefile
-                 tests/plan/no_plan/Makefile
-                 tests/plan/not-enough-tests/Makefile
-                 tests/plan/sane/Makefile
-                 tests/plan/skip_all/Makefile
-                 tests/plan/too-many-plans/Makefile
-                 tests/plan/too-many-tests/Makefile
-                 tests/skip/Makefile
-                 tests/todo/Makefile
                 ])
 AC_OUTPUT

trunk/psModules/test/tap/src/tap.c

@@ -25 +25 @@
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <stdarg.h>