summaryrefslogtreecommitdiff
path: root/cesar/common/make
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-23 16:13:53 +0200
committerNicolas Schodet2011-08-03 11:08:48 +0200
commitb8efda4727c205badba610ad89c3310f689ba717 (patch)
treeaf63fee9434a9cf702e2d1cba72169c692807f85 /cesar/common/make
parent4e05a03631561c413e957681d97e7b2df3a4ed9e (diff)
cesar/common/make/test: fix failling tests
Diffstat (limited to 'cesar/common/make')
-rw-r--r--cesar/common/make/test/Config-output1
-rw-r--r--cesar/common/make/test/Config.alt-output1
-rw-r--r--cesar/common/make/test/b_shout.h-output1
-rw-r--r--cesar/common/make/test/clean-output3
-rw-r--r--cesar/common/make/test/ecos.ecc.sh-output1
-rw-r--r--cesar/common/make/test/first-output1
-rw-r--r--cesar/common/make/test/nothing-output1
-rw-r--r--cesar/common/make/test/project/Makefile2
-rw-r--r--cesar/common/make/test/test_make.c-output1
-rw-r--r--cesar/common/make/test/test_make.h-output1
-rwxr-xr-xcesar/common/make/test/test_make.sh2
11 files changed, 12 insertions, 3 deletions
diff --git a/cesar/common/make/test/Config-output b/cesar/common/make/test/Config-output
index 312d3bef5e..57877fb9b4 100644
--- a/cesar/common/make/test/Config-output
+++ b/cesar/common/make/test/Config-output
@@ -1,3 +1,4 @@
CONF merge
CONF headers
+CONF build-info
MAKE ecos.all
diff --git a/cesar/common/make/test/Config.alt-output b/cesar/common/make/test/Config.alt-output
index d6dbf56b68..e553df9d51 100644
--- a/cesar/common/make/test/Config.alt-output
+++ b/cesar/common/make/test/Config.alt-output
@@ -1,5 +1,6 @@
CONF merge
CONF headers
+CONF build-info
CC [host] ../../../../common/make/test/modules/b/src/b_shout.c
LINK [host] obj/test_make
LDXX [host] obj/test_cpp
diff --git a/cesar/common/make/test/b_shout.h-output b/cesar/common/make/test/b_shout.h-output
index a661c5ec6b..5a416909b5 100644
--- a/cesar/common/make/test/b_shout.h-output
+++ b/cesar/common/make/test/b_shout.h-output
@@ -1,3 +1,4 @@
+CONF build-info
CC [host] ../../../../common/make/test/modules/b/src/b_shout.c
LINK [host] obj/test_make
LDXX [host] obj/test_cpp
diff --git a/cesar/common/make/test/clean-output b/cesar/common/make/test/clean-output
index 88b8158fd3..0066f4d28b 100644
--- a/cesar/common/make/test/clean-output
+++ b/cesar/common/make/test/clean-output
@@ -1,6 +1,7 @@
CONF merge
rm -f obj/Config.empty obj/Config.merged obj/Config.list obj/Module.list
-rm -rf obj/inc/config.h obj/inc/config obj/inc/module_config.h
+rm -rf obj/inc/config.h obj/inc/config obj/inc/module_config.h \
+ obj/inc/build_info.h
rm -f obj/test_make obj/test_cpp obj/test_make_ecos.elf \
rm -rf obj/ecos/tree.stamp obj/ecos/build
rm -rf obj/ecos/headers.stamp obj/ecos/install
diff --git a/cesar/common/make/test/ecos.ecc.sh-output b/cesar/common/make/test/ecos.ecc.sh-output
index fe4145120f..4df8a2d761 100644
--- a/cesar/common/make/test/ecos.ecc.sh-output
+++ b/cesar/common/make/test/ecos.ecc.sh-output
@@ -1,5 +1,6 @@
ECOS conf
ECOS tree
MAKE ecos.defs
+CONF build-info
MAKE ecos.headers
MAKE ecos.all
diff --git a/cesar/common/make/test/first-output b/cesar/common/make/test/first-output
index c14e4b3ef0..0c15865c0a 100644
--- a/cesar/common/make/test/first-output
+++ b/cesar/common/make/test/first-output
@@ -4,6 +4,7 @@ MAKE ecos.defs
CONF merge
CONF headers
CONF module
+CONF build-info
CC [host] src/test_make.c
CC [host] ../../../../common/make/test/modules/a/src/a.c
CC [host] ../../../../common/make/test/modules/b/src/b_print.c
diff --git a/cesar/common/make/test/nothing-output b/cesar/common/make/test/nothing-output
index ae63c9beb5..fd60ed4d5e 100644
--- a/cesar/common/make/test/nothing-output
+++ b/cesar/common/make/test/nothing-output
@@ -1 +1,2 @@
+CONF build-info
MAKE ecos.all
diff --git a/cesar/common/make/test/project/Makefile b/cesar/common/make/test/project/Makefile
index fd49464144..b2575eb6fd 100644
--- a/cesar/common/make/test/project/Makefile
+++ b/cesar/common/make/test/project/Makefile
@@ -15,7 +15,7 @@ test_cpp_MODULES = lib common/make/test/modules/a common/make/test/modules/b
TARGET_PROGRAMS = test_make_ecos
test_make_ecos_SOURCES = test_make.c
-test_make_ecos_MODULES = lib common/make/test/modules/a
+test_make_ecos_MODULES = lib hal/arch common/make/test/modules/a
# Test overrides.
common_make_test_modules_c_MODULE_SOURCES = c.c
diff --git a/cesar/common/make/test/test_make.c-output b/cesar/common/make/test/test_make.c-output
index 2eb4c3ca0f..0786733550 100644
--- a/cesar/common/make/test/test_make.c-output
+++ b/cesar/common/make/test/test_make.c-output
@@ -1,3 +1,4 @@
+CONF build-info
CC [host] src/test_make.c
LINK [host] obj/test_make
CC [target] src/test_make.c
diff --git a/cesar/common/make/test/test_make.h-output b/cesar/common/make/test/test_make.h-output
index 6c119db535..dda9d00d03 100644
--- a/cesar/common/make/test/test_make.h-output
+++ b/cesar/common/make/test/test_make.h-output
@@ -1,3 +1,4 @@
+CONF build-info
CC [host] src/test_make.c
LINK [host] obj/test_make
CXX [host] src/test_cpp.cpp
diff --git a/cesar/common/make/test/test_make.sh b/cesar/common/make/test/test_make.sh
index 330943f6d2..f492018410 100755
--- a/cesar/common/make/test/test_make.sh
+++ b/cesar/common/make/test/test_make.sh
@@ -18,7 +18,7 @@ function runmake () {
sleep 1
}
function grepcap () {
- grep '^[[:upper:]]\{2,\} ' | grep -v '\.\./lib/'
+ grep '^[[:upper:]]\{2,\} ' | grep -v '\.\./lib/' | grep -v '\.\./hal/arch/'
}
if [[ "$1" = quick ]]