From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 23 Oct 2007 11:07:00 +0000 (+0000)
Subject: Added test for 'x' in generated headers.
X-Git-Tag: v0.1~73
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/37a4d96e9c100cb697f5d7fffb7f437386f95a16

Added test for 'x' in generated headers.

darcs-hash:20071023110738-f2ef6-3feade67421080da0742b1610c4c727e686f9ec9.gz
---

diff --git a/tests/headers/generated/Makefile.omk b/tests/headers/generated/Makefile.omk
index 6e2ddbb..890c213 100644
--- a/tests/headers/generated/Makefile.omk
+++ b/tests/headers/generated/Makefile.omk
@@ -2,6 +2,9 @@ SUBDIRS=lincan
 
 default_CONFIG = CONFIG_TEST_NUM=123 CONFIG_TEST_STR=Hello
 default_CONFIG += CONFIG_TEST_APOS="Text+apostrophes"
+default_CONFIG += CONFIG_OC_LINCAN=x CONFIG_UNKNOWN=x
+
+LOCAL_CONFIG_H = toplevel_config.h
 
 config_include_HEADERS = global.h
 
diff --git a/tests/headers/generated/config.omk-default b/tests/headers/generated/config.omk-default
index b8c66f6..cacb9ae 100644
--- a/tests/headers/generated/config.omk-default
+++ b/tests/headers/generated/config.omk-default
@@ -42,3 +42,5 @@ CONFIG_OC_LINCAN_CARD_nsi_canpci=n
 CONFIG_TEST_NUM=123
 CONFIG_TEST_STR=Hello
 CONFIG_TEST_APOS="Text+apostrophes"
+#CONFIG_OC_LINCAN=x
+#CONFIG_UNKNOWN=x
diff --git a/tests/headers/generated/correct/toplevel_config.h b/tests/headers/generated/correct/toplevel_config.h
new file mode 100644
index 0000000..80c4589
--- /dev/null
+++ b/tests/headers/generated/correct/toplevel_config.h
@@ -0,0 +1,9 @@
+/* Automatically generated from */
+/* config file: /home/sojka/devel/omk/tests/headers/generated/config.omk-default */
+#ifndef _LOCAL_CONFIG_H
+#define _LOCAL_CONFIG_H
+#define CONFIG_TEST_NUM 123
+#define CONFIG_TEST_STR Hello
+#define CONFIG_TEST_APOS "Text+apostrophes"
+#define CONFIG_OC_LINCAN 1
+#endif /*_LOCAL_CONFIG_H*/
diff --git a/tests/headers/generated/runtest b/tests/headers/generated/runtest
index 6979c56..2576a16 100755
--- a/tests/headers/generated/runtest
+++ b/tests/headers/generated/runtest
@@ -16,6 +16,10 @@ LC=$(find _build -wholename '*/lincan/lincan_config.h')
 test -f "$LC" || canttest "Can't find the produced local config"
 grep -Fv "/* config file:" $LC | diff -u correct/lincan_config.h - || error "Local config differs"
 
+TLC=$(find _build -name 'toplevel_config.h')
+test -f "$TLC" || canttest "Can't find the produced local config"
+grep -Fv "/* config file:" $TLC | diff -u correct/toplevel_config.h - || error "Toplevel local config differs"
+
 stat -c '%z' $LC > stat.log1
 sleep 1
 touch config.omk-default
diff --git a/tests/headers/generated/runtest-default-cflags b/tests/headers/generated/runtest-default-cflags
index a62df03..0e7313c 100755
--- a/tests/headers/generated/runtest-default-cflags
+++ b/tests/headers/generated/runtest-default-cflags
@@ -4,5 +4,8 @@ source ../../functions.sh
 
 make default-config || canttest
 
+make distclean
+LC_MESSAGES=C
+export LC_MESSAGES
 make 2> stderr || canttest
 grep "control reaches end of non-void function" stderr || error "Default CFLAGS are not applied"