Changeset 1404 for trunk/tests

Timestamp:

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

Author:

bird

Message:

test case fixes.

Location:

trunk/tests

Files:

• dummy_defined_X.c (modified) (2 diffs)
• inherit-bld/Config.kmk (modified) (1 diff)
• inherit-bld/Makefile.kmk (modified) (1 diff)

trunk/tests/dummy_defined_X.c

@@ +1 @@
+/* $Id$ */
+/** @file
+ * Tests - Dummy test program checking that X == 42, possibly doing this via y.
+ */
+
+/*
+ * Copyright (c) 2008 knut st. osmundsen <bird-src-spam@anduin.net>
+ *
+ * This file is part of kBuild.
+ *
+ * kBuild is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kBuild is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kBuild; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
 #ifndef X
 # error "X isn't defined, test the is busted."
+#endif
+
+#ifndef y
+# define y 42
+#endif
+
+#if X != 42
+# error "X != 42"
 #endif
 
@@ -7 +41 @@
     return 0;
 }
+

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