Index: App/Common.h
===================================================================
diff -u -r8ca991f9c04d8d301ada71eabc297f514b0d6cf8 -rcda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd
--- App/Common.h	(.../Common.h)	(revision 8ca991f9c04d8d301ada71eabc297f514b0d6cf8)
+++ App/Common.h	(.../Common.h)	(revision cda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd)
@@ -84,76 +84,6 @@
 #define MAKE_WORD_OF_BYTES(h,l)         ((((U16)(h) << SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))
 #define MAKE_LONG_OF_WORDS(h,l)         ((((U32)(h) << SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
 
-// **** Script Support Definitions ****
-
-#define OVERRIDE_KEY    0xCCC33C33
-#define OVERRIDE_RESET  0x00000000
-
-// DATA_DECL - declares an overrideable data variable
-// t        = data's type
-// t_name   = name for data's structure type
-// d_name   = name for data's variable
-// i_val    = data's initial value
-// o_val    = data's initial override value
-#define DATA_DECL( t, t_name, d_name, i_val, o_val ) \
-struct t_name \
-{ \
-    t   data; \
-    t   ovInitData; \
-    t   ovData; \
-    U32 override; \
-}; \
-static struct t_name d_name = { i_val, o_val, o_val, OVERRIDE_RESET }
-
-// DATA_GET_PROTOTYPE - declares a function prototype for a DATA getter function
-// t        = data's type
-// f_name   = name for DATA getter function
-#define DATA_GET_PROTOTYPE( t, f_name ) t f_name( void )
-
-// DATA_GET - creates a getter function for a DATA
-// t        = data's type
-// f_name   = name for DATA getter function
-// d_name   = name of data's variable
-#define DATA_GET( t, f_name, d_name ) \
-t f_name( void ) \
-{ \
-    t result = d_name.data; \
-    if ( OVERRIDE_KEY == d_name.override ) \
-    { \
-        result = d_name.ovData; \
-    } \
-    return result; \
-}
-
-// DATA_OVERRIDE_FUNC - creates an override and a reset override function for a DATA
-// t        = data's type
-// o_name   = name for override function
-// r_name   = name for reset override function
-// d_name   = name of data's variable
-#define DATA_OVERRIDE_FUNC( t, o_name, r_name, d_name ) \
-BOOL o_name( t value ) \
-{ \
-    BOOL result = FALSE; \
-    if ( TRUE == isTestingActivated() ) \
-    { \
-        result = TRUE; \
-        d_name.ovData = value; \
-        d_name.override = OVERRIDE_KEY; \
-    } \
-    return result; \
-} \
-BOOL r_name( void ) \
-{ \
-    BOOL result = FALSE; \
-    if ( TRUE == isTestingActivated() ) \
-    { \
-        result = TRUE; \
-        d_name.override = OVERRIDE_RESET; \
-        d_name.ovData = d_name.ovInitData; \
-    } \
-    return result; \
-}
-
 // **** VectorCAST Definitions ****
 
 #ifdef _VECTORCAST_
@@ -170,4 +100,7 @@
 
 #endif
 
+// include test support definitions and macros
+#include "TestSupport.h"
+
 #endif