summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2010-02-02 11:03:10 +0100
committerNicolas Schodet2011-08-03 11:08:48 +0200
commitda3a11222cfec07153f0e21d3e3f8ccd4748dbbc (patch)
tree4216300993a65776d9ac61747d91173088cfb7f2
parentb8efda4727c205badba610ad89c3310f689ba717 (diff)
cesar/common/make/test: ignore spaces at end of line
-rw-r--r--cesar/common/make/test/clean-output2
-rwxr-xr-xcesar/common/make/test/test_make.sh7
2 files changed, 6 insertions, 3 deletions
diff --git a/cesar/common/make/test/clean-output b/cesar/common/make/test/clean-output
index 0066f4d28b..5c96e91f2b 100644
--- a/cesar/common/make/test/clean-output
+++ b/cesar/common/make/test/clean-output
@@ -9,6 +9,6 @@ rm -f obj/ecos/ecos.ecc obj/ecos/ecos-cov.ecc new-ecos.ecc
if [ -d obj/ecos ]; then rmdir obj/ecos; fi
rm -f obj/inc/dir.stamp obj/dir.stamp \
-rm -rf
+rm -rf
if [ -d obj/inc ]; then rmdir obj/inc; fi
if [ -d obj ]; then rmdir obj; fi
diff --git a/cesar/common/make/test/test_make.sh b/cesar/common/make/test/test_make.sh
index f492018410..87ada6edb7 100755
--- a/cesar/common/make/test/test_make.sh
+++ b/cesar/common/make/test/test_make.sh
@@ -17,8 +17,11 @@ function runmake () {
make -C project "$@" &> "$tmp"
sleep 1
}
+function strips () {
+ sed -e 's/ \+$//'
+}
function grepcap () {
- grep '^[[:upper:]]\{2,\} ' | grep -v '\.\./lib/' | grep -v '\.\./hal/arch/'
+ grep '^[[:upper:]]\{2,\} ' | grep -v '\.\./lib/' | grep -v '\.\./hal/arch/' | strips
}
if [[ "$1" = quick ]]
@@ -59,7 +62,7 @@ runmake Config.alt PROJECT_CONFIG=Config.alt
grepcap < "$tmp" | diff - Config.alt-output
runmake clean clean
-grep -v 'make:' < "$tmp" | grep -v ' obj/' | diff - clean-output
+grep -v 'make:' < "$tmp" | grep -v ' obj/' | strips | diff - clean-output
rm -f "$tmp"
echo PASS