Fix non-verbose compiler commands spanning multiple lines.

[blhc/blhc.git] / t / tests.t

diff --git a/t/tests.t b/t/tests.t
index 3fbdb3efa1de73bba69fdd8f43bdf24e20f5179a..42263dfc186d3e1e5519d96756478e66c1dc997b 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 204;
+use Test::More tests => 212;
 
 
 sub is_blhc {
@@ -61,7 +61,7 @@ is_blhc '', '', 2,
         $usage;
 
 is_blhc '', '--version', 0,
-        'blhc 0.03  Copyright (C) 2012-2013  Simon Ruderich
+        'blhc 0.04  Copyright (C) 2012-2013  Simon Ruderich
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -643,6 +643,7 @@ NONVERBOSE BUILD: [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o
 NONVERBOSE BUILD: [ 82%] Building C object src/CMakeFiles/test/test.c.o
 CXXFLAGS missing (-Wformat): cd /tmp/test/src && /usr/bin/c++ -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -o CMakeFiles/test-verbose.dir/verbose.cpp.o -c -D_FORTIFY_SOURCE=2 /tmp/test/src/test-verbose/verbose.cpp
 CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -o CMakeFiles/test-verbose-c.dir/verbose-c.c.o -c -D_FORTIFY_SOURCE=2 /tmp/test/src/test-verbose-c/verbose-c.c
+NONVERBOSE BUILD: Compiling test.c \     gcc test.c
 ';
 
 
@@ -651,6 +652,10 @@ CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O
 is_blhc 'configure', '', 1,
         $empty;
 
+is_blhc 'configure-check', '', 4,
+        'NONVERBOSE BUILD:   CC              = gcc -std=gnu99 -std=gnu99 test.c
+';
+
 is_blhc 'make', '', 1,
         $empty;
 
@@ -832,10 +837,16 @@ LDFLAGS missing (-pie -Wl,-z,relro): gcc -fPIE -o test test.o
 
 # architecture in older buildd logs
 
-is_blhc 'buildd-architecture-old', '', 0,
+is_blhc 'dpkg-buildpackage-architecture-old', '', 0,
         '';
 
 
+# correct architecture detection
+
+is_blhc 'buildd-architecture',     '', 0, '';
+is_blhc 'buildd-architecture-old', '', 0, '';
+
+
 # ignore architecture
 
 is_blhc ['arch-avr32', 'arch-i386', 'empty', 'arch-mipsel'],
@@ -880,6 +891,8 @@ my $debian_hardening_wrapper =
 ';
 is_blhc 'debian-hardening-wrapper', '', 16,
         $debian_hardening_wrapper;
+is_blhc 'debian-hardening-wrapper-old-build-depends', '', 16,
+        $debian_hardening_wrapper;
 is_blhc 'debian-hardening-wrapper-pbuilder', '', 16,
         $debian_hardening_wrapper;