Changeset 10822

Timestamp:

Dec 21, 2006, 10:32:47 AM (20 years ago)

Author:

magnier

Message:

better definition for note

Location:

trunk/psLib/test

Files:

• pstap/src/pstap.h (modified) (2 diffs)
• types/tap_psArguments_all.c (modified) (1 diff)
• types/tap_psArray_all.c (modified) (1 diff)
• types/tap_psBitSet_all.c (modified) (1 diff)
• types/tap_psHash_all.c (modified) (1 diff)
• types/tap_psListIterator.c (modified) (1 diff)
• types/tap_psList_all.c (modified) (1 diff)
• types/tap_psLookupTable_all.c (modified) (1 diff)
• types/tap_psMetadataConfigParse_time.c (modified) (1 diff)
• types/tap_psMetadataConfigRead.c (modified) (1 diff)
• types/tap_psMetadataConfig_input.c (modified) (1 diff)
• types/tap_psMetadataItemCompare.c (modified) (1 diff)
• types/tap_psMetadataItemParse.c (modified) (1 diff)
• types/tap_psMetadataIterator.c (modified) (1 diff)
• types/tap_psMetadata_copying.c (modified) (1 diff)
• types/tap_psMetadata_creating.c (modified) (1 diff)
• types/tap_psMetadata_manip.c (modified) (1 diff)
• types/tap_psMetadata_polynomials.c (modified) (1 diff)
• types/tap_psMetadata_printing.c (modified) (1 diff)
• types/tap_psPixels_all.c (modified) (1 diff)

trunk/psLib/test/pstap/src/pstap.h

@@ -15 +15 @@
 
            // write a comment which is counted as a test (and swallowed by prove)
-           # define note(A, ...) _gen_result(1, __func__, __FILE__, __LINE__, A, ## __VA_ARGS__);
+           # define note(A, ...){ \
+           fprintf(stdout, A, ## __VA_ARGS__); \
+           fprintf(stdout, "\n[%s:%d in %s]\n", __FILE__, __LINE__, __func__); }
+
+       // write a comment which is counted as a test (and swallowed by prove)
+       # define noted(A, ...) _gen_result(1, __func__, __FILE__, __LINE__, A, ## __VA_ARGS__);
 
 // use to test the value of a float
 # define ok_float(VALUE,EXPECT,COMMENT, ...)\
 ok((fabsf((VALUE)-(EXPECT)) < FLT_EPSILON), COMMENT, ## __VA_ARGS__);
-
-// write a comment which is counted as a test (and swallowed by prove)
-# define note(A, ...) _gen_result(1, __func__, __FILE__, __LINE__, A, ## __VA_ARGS__);
 
 // use to test the value of a double
@@ -73 +75 @@
 
 // write a comment which is counted as a test (and swallowed by prove)
-# define note(A, ...) _gen_result(1, __func__, __FILE__, __LINE__, A, ...);
+// write a comment which is counted as a test (and swallowed by prove)
+# define note(A, ...){ \
+    fprintf(stdout, A, ...); \
+    fprintf(stdout, "\n[%s:%d in %s]\n", __FILE__, __LINE__, __func__); }
 
 // use to test the value of a float

trunk/psLib/test/types/tap_psArguments_all.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(30);
+    plan_tests(27);
 
     note("Tests for psArguments Functions");

trunk/psLib/test/types/tap_psArray_all.c

@@ -24 +24 @@
 int main(void)
 {
-    plan_tests(34);
+    plan_tests(29);
 
     note("Tests for psArray Functions");

trunk/psLib/test/types/tap_psBitSet_all.c

@@ -22 +22 @@
 int main(void)
 {
-    plan_tests(34);
+    plan_tests(31);
 
     note("Tests for psBitSet Functions");

trunk/psLib/test/types/tap_psHash_all.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(29);
+    plan_tests(25);
 
     note("Tests for psHash Functions");

trunk/psLib/test/types/tap_psListIterator.c

@@ -72 +72 @@
 int main (void)
 {
-    plan_tests(73);
+    plan_tests(66);
 
     note("psListIterator tests");

trunk/psLib/test/types/tap_psList_all.c

@@ -26 +26 @@
 int main(void)
 {
-    plan_tests(64);
+    plan_tests(60);
 
     note("Tests for psList Functions");

trunk/psLib/test/types/tap_psLookupTable_all.c

@@ -24 +24 @@
 int main(void)
 {
-    plan_tests(30);
+    plan_tests(28);
 
     note("Tests for psLookupTable Functions");

trunk/psLib/test/types/tap_psMetadataConfigParse_time.c

@@ -7 +7 @@
 int main (void)
 {
-    plan_tests(41);
+    plan_tests(40);
 
     note("psMetadataParseConfig time format tests");

trunk/psLib/test/types/tap_psMetadataConfigRead.c

@@ -148 +148 @@
 int main (void)
 {
-    plan_tests(58);
+    plan_tests(52);
 
     note("psMetadataConfigRead tests");

trunk/psLib/test/types/tap_psMetadataConfig_input.c

@@ -25 +25 @@
 int main(void)
 {
-    plan_tests(36);
+    plan_tests(33);
 
     note("Tests for psMetadataConfig Input Functions");

trunk/psLib/test/types/tap_psMetadataItemCompare.c

@@ -19 +19 @@
 int main (void)
 {
-    plan_tests(24);
+    plan_tests(22);
 
     note("psMetadataItemCompare() tests");

trunk/psLib/test/types/tap_psMetadataItemParse.c

@@ -20 +20 @@
 int main (void)
 {
-    plan_tests(114);
+    plan_tests(112);
 
     note("psMetadataItemParse() tests");

trunk/psLib/test/types/tap_psMetadataIterator.c

@@ -102 +102 @@
 int main (void)
 {
-    plan_tests(255);
+    plan_tests(242);
 
     note("psMetadataIterator tests");

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(40);
+    plan_tests(36);
 
     note("psMetadataCopy and psMetadataItemCopy tests");

trunk/psLib/test/types/tap_psMetadata_creating.c

@@ -25 +25 @@
 int main(void)
 {
-    plan_tests(46);
+    plan_tests(42);
 
     note("psMetadata & psMetadataItem Creation Functions");

trunk/psLib/test/types/tap_psMetadata_manip.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(52);
+    plan_tests(48);
 
     note("psMetadataLookup, Remove, and Iterator Fxns");

trunk/psLib/test/types/tap_psMetadata_polynomials.c

@@ -24 +24 @@
 int main(void)
 {
-    plan_tests(96);
+    plan_tests(89);
 
     note("psPolynomial(1D, 2D, 3D, & 4D)(to/from)Metadata tests");

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -24 +24 @@
 int main(void)
 {
-    plan_tests(33);
+    plan_tests(30);
 
     note("psMetadataPrint and psMetadataItemPrint tests");

trunk/psLib/test/types/tap_psPixels_all.c

@@ -23 +23 @@
 int main(void)
 {
-    plan_tests(41);
+    plan_tests(38);
 
     note("Tests for psPixels Functions");