Changeset 9848 for trunk/psLib/test/types

Timestamp:

Nov 3, 2006, 2:20:10 PM (20 years ago)

Author:

drobbin

Message:

Removed a couple unreachable spots from psMetadataConfig in parseMetadataItem. Added error check to parseVector for invalid values (was looping indefinitely for ie, % or NAN). Updated tests accordingly

Location:

trunk/psLib/test/types

Files:

• metaconf.in (modified) (3 diffs)
• tap_psMetadataConfig_input.c (modified) (1 diff)

trunk/psLib/test/types/metaconf.in

@@ -7 +7 @@
 item5            STR       GNIRTS           # I am a string
 item6            S32       10 1
+item6-1          S32       ~
 item7            S64       555
 item8            S8        3
 item8            S8        5
+item8-1          S8        5 1
 itemu1           U16       2
+itemu1-1         U16       2 1
 itemu2           U32       55
 itemu2-1         U32       55 1
+itemu3-1         U8        1 2
 itemu3           U8        1
 itemu4           U64       1634
 item9            BOOL      F                # I am a boolean2
 item10           S16       16
+item10-1         S16       16 16
 @vector1  S8  1 2 3 4 5   # I am a vector
+@vector1-1 S8 % #
 @vector2  S16 1 2 3 4 5
 @vector3  S32 1 2 3 4 5
@@ -35 +41 @@
 f32              S32       666              # f32_1
 f32              S32       665              # f32_2
-
-
+f32 MULTI
 
 f32 METADATA
@@ -60 +65 @@
 END  # I am a metadata
 
-#item1-1          BOOL      TRUTH
-#item11           C32       16+2i            # I am Complex
      TYPE  C32  3
      TYPE  C32  3
      TYPE PS_TYPE_C32 2                 #
-newC32 C32 7i+5
-newC32 PS_TYPE_C32 7i+5
+newC32      C32 7i+5
+newC32      PS_TYPE_C32 7i+5
+#item11           C32       16+2i            # I am Complex
+
+TYPE PS_TYPE_DD D
+newDD   PS_TYPE_DD
+DD2     PS_TYPE_DD   ""
+
 TYPE            1
 TYPE

trunk/psLib/test/types/tap_psMetadataConfig_input.c

@@ -241 +241 @@
             printf("\n\n name=%s\n", tempItem->name);
     }
-
-
     //Check for Memory leaks
     {