summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-02-21 12:09:23 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-02-21 12:17:06 +0000
commitb1dc3a2e5a161ab92b481d69e6e5cbb34e5c9395 (patch)
treec8674053d8fc44e929e94b81cab6363086338dfc /check
parenta36d1414c114ac9c56ec2852ecc50a14f8add12c (diff)
parent765331d76fc252d06b70532f869c82f8611e2b48 (diff)
downloadmorph-b1dc3a2e5a161ab92b481d69e6e5cbb34e5c9395.tar.gz
Merge branch 'samthursfield/only-build-systems' of git://git.baserock.org/baserock/baserock/morph
This includes a merge fixup in ./check, so that it does not complain about build-system-autotools' test's tabs.
Diffstat (limited to 'check')
-rwxr-xr-xcheck3
1 files changed, 2 insertions, 1 deletions
diff --git a/check b/check
index baced129..76b50208 100755
--- a/check
+++ b/check
@@ -37,6 +37,7 @@ if not morphlib.got_yaml:
sys.exit(1)
" > /dev/null 2>&1
then
+ cmdtest tests.build
cmdtest tests.as-root
else
echo "NOT RUNNING tests.as-root"
@@ -51,7 +52,7 @@ then
git ls-files |
grep -v '\.gz$' |
grep -Ev 'tests[^/]*/.*\.std(out|err)' |
- grep -vF 'tests/build-system-autotools.script' |
+ grep -vF 'tests.build/build-system-autotools.script' |
while read x
do
if tr -cd '\t' < "$x" | grep . > /dev/null