Changeset 1404 in kBuild for trunk/tests/inherit-bld

Timestamp:

Mar 17, 2008 8:02:15 AM (17 years ago)

Author:

bird

Message:

test case fixes.

Location:

trunk/tests/inherit-bld

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/tests/inherit-bld/Config.kmk

@@ -46 +46 @@
 BLD_TYPE_dbgbld4_EXTENDS = dbgbld3
 
+#
+# For inherit-bld5 - appending inheritance.
+#
+KBUILD_BLD_TYPES += dbgbld5
+BLD_TYPE_dbgbld5_EXTENDS = dbgbld3
+BLD_TYPE_dbgbld5_EXTENDS_BY = appending
+
+#
+# For inherit-bld6 - prepending inheritance.
+#
+KBUILD_BLD_TYPES += dbgbld6
+BLD_TYPE_dbgbld6_EXTENDS = dbgbld3
+BLD_TYPE_dbgbld6_EXTENDS_BY = prepending
+
+#
+# For inherit-bld6 - overriding inheritance.
+#
+KBUILD_BLD_TYPES += dbgbld7
+BLD_TYPE_dbgbld7_EXTENDS = dbgbld3
+BLD_TYPE_dbgbld7_EXTENDS_BY = overriding
+

trunk/tests/inherit-bld/Makefile.kmk

@@ -58 +58 @@
 
 # Test that appending build type inheritance works - dbgbld5 extends dbgbld3.
-## @todo somehow make this test the order
 PROGRAMS += inherit-bld5
 inherit-bld5_TEMPLATE = TST
 inherit-bld5_BLD_TYPE = dbgbld4
-inherit-bld5_DEFS.dbgbld3 = X=y
-inherit-bld5_DEFS.dbgbld5 = SOMETHING
+inherit-bld5_DEFS.dbgbld3 = X=y y=0
+inherit-bld5_DEFS.dbgbld5 = y=42
 inherit-bld5_SOURCES = ../dummy_defined_X.c
 
 # Test that prepending build type inheritance works - dbgbld6 extends dbgbld3.
-## @todo somehow make this test the order
 PROGRAMS += inherit-bld6
 inherit-bld6_TEMPLATE = TST
 inherit-bld6_BLD_TYPE = dbgbld6
-inherit-bld6_DEFS.dbgbld3 = X=y
-inherit-bld6_DEFS.dbgbld6 = SOMETHING
+inherit-bld5_DEFS.dbgbld3 = X=y y=42
+inherit-bld5_DEFS.dbgbld6 = y=0
 inherit-bld6_SOURCES = ../dummy_defined_X.c