Changeset 1412 in kBuild for trunk/tests

Timestamp:

Mar 18, 2008 9:20:30 PM (17 years ago)

Author:

bird

Message:

More tests.

Location:

trunk/tests/inherit-bld

Files:

• Config.kmk (modified) (2 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/tests/inherit-bld/Config.kmk

@@ -61 +61 @@
 
 #
-# For inherit-bld6 - overriding inheritance.
+# For inherit-bld7 - overriding inheritance.
 #
 KBUILD_BLD_TYPES += dbgbld7
@@ -67 +67 @@
 BLD_TYPE_dbgbld7_EXTENDS_BY = overriding
 
+#
+# For inherit-bld10 thru 19 - overriding inheritance.
+#
+KBUILD_BLD_TYPES += dbgbld10 dbgbld11
+BLD_TYPE_dbgbld11_EXTENDS = dbgbld10
+
+#
+# For inherit-bld20 thru 29 - prepending inheritance.
+#
+KBUILD_BLD_TYPES += dbgbld20 dbgbld21
+BLD_TYPE_dbgbld21_EXTENDS = dbgbld20
+BLD_TYPE_dbgbld21_EXTENDS_BY = prepending
+

trunk/tests/inherit-bld/Makefile.kmk

@@ -55 +55 @@
 inherit-bld4_BLD_TYPE = dbgbld4
 inherit-bld4_DEFS.dbgbld3 = X=y
-inherit-bld4_DEFS.dbgbld4 = $(inherit-bld4_DEFS.dbgbld3)        # remove me
 inherit-bld4_SOURCES = ../dummy_defined_X.c
 
@@ -63 +62 @@
 inherit-bld5_BLD_TYPE = dbgbld5
 inherit-bld5_DEFS.dbgbld3 = X=y y=0
-#inherit-bld5_DEFS.dbgbld5 = y=42
-inherit-bld5_DEFS.dbgbld5 = $(inherit-bld5_DEFS.dbgbld3) y=42   # remove me
+inherit-bld5_DEFS.dbgbld5 = y=42
 inherit-bld5_SOURCES = ../dummy_defined_X.c
 
@@ -72 +70 @@
 inherit-bld6_BLD_TYPE = dbgbld6
 inherit-bld6_DEFS.dbgbld3 = X=y y=42
-#inherit-bld6_DEFS.dbgbld6 = y=0
-inherit-bld6_DEFS.dbgbld6 = y=0 $(inherit-bld6_DEFS.dbgbld3)    # remove me
+inherit-bld6_DEFS.dbgbld6 = y=0
 inherit-bld6_SOURCES = ../dummy_defined_X.c
+
+
+#
+# Tests where we inherit from a target and force build type which
+# relies on inheritance. These are the fine points...
+#
+PROGRAMS += inherit-bld10
+inherit-bld10_TEMPLATE = TST
+inherit-bld10_BLD_TYPE = dbgbld11
+inherit-bld10_DEFS = X=y
+inherit-bld10_DEFS.dbgbld10 = y=42
+inherit-bld10_SOURCES = ../dummy_defined_X.c
+
+# Tests that target and build inheriting works together.
+PROGRAMS += inherit-bld11
+inherit-bld11_EXTENDS = inherit-bld10
+
+# Tests that dbgbld11 is picked from the target rather than the parent.
+PROGRAMS += inherit-bld12
+inherit-bld12_EXTENDS = inherit-bld10
+inherit-bld12_DEFS = y=0
+inherit-bld12_DEFS.dbgbld11 = X=z z=42
+
+# Tests that prepending works.
+PROGRAMS += inherit-bld20
+inherit-bld20_TEMPLATE = TST
+inherit-bld20_BLD_TYPE = dbgbld21
+inherit-bld20_DEFS = X=y
+inherit-bld20_DEFS.dbgbld20 = y=42
+inherit-bld20_DEFS.dbgbld21 = y=0
+#inherit-bld20_DEFS.dbgbld21 = y=0 y=42 <-- expected result.
+inherit-bld20_SOURCES = ../dummy_defined_X.c
+
+# Tests that prepending + target inheritance works as expected. funky!
+PROGRAMS += inherit-bld21
+inherit-bld21_EXTENDS = inherit-bld20
+inherit-bld21_DEFS.dbgbld20 = Y=y
+#inherit-bld21_DEFS.dbgbld21 = y=0 y=42 Y=y <-- expected result; dbgbld21 from parent + our dbgbld20.
+inherit-bld21_SOURCES = ../dummy_defined_Y.c