Ignore unimportant lines at the beginning of the log.

diff --git a/bin/blhc b/bin/blhc
index 585df64686548a44b699b8a8abbd8221ef449ffb..880d24df4d2599f6cae394595bb1eafd6fce4665 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -250,8 +250,14 @@ my $exit = 0;
 # Input lines, contain only the lines with compiler commands.
 my @input = ();
 
+my $start = 0;
 my $continuation = 0;
 while (my $line = <>) {
+    # We skip over unimportant lines at the beginning to prevent false
+    # positives.
+    $start = 1 if $line =~ /^dpkg-buildpackage:/;
+    next if not $start;
+
     # Ignore compiler warnings for now.
     next if $line =~ /$warning_regex/;
 

diff --git a/t/logs/bad b/t/logs/bad
index 9dbae59488133ec06ce2f9949ec8a086a5ff2e94..49357a1e96b3d69b51e5bd8a64194ee7ac46423e 100644 (file)
--- a/t/logs/bad
+++ b/t/logs/bad
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 configure: running /bin/bash ./configure ... 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security' 'CPPFLAGS=-D_FORTIFY_SOURCE=2' 'CXXFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security' 'LDFLAGS=-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed' ...
 
 checking for gcc... gcc

diff --git a/t/logs/bad-cflags b/t/logs/bad-cflags
index 3f47182111e2e01c1811af93f2cc21865253cbec..3de1841595aee5657eb85c88fe393f76eacabac1 100644 (file)
--- a/t/logs/bad-cflags
+++ b/t/logs/bad-cflags
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 gcc -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.c

diff --git a/t/logs/bad-cppflags b/t/logs/bad-cppflags
index ff128e68f0485919882a843fdb97f1192862bad1..48e7f5a807699fbdf779706177e95dba7eb97945 100644 (file)
--- a/t/logs/bad-cppflags
+++ b/t/logs/bad-cppflags
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-a.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-b.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-c.c

diff --git a/t/logs/bad-ldflags b/t/logs/bad-ldflags
index 9296f4c99a7d7dcab4155c9831bd8e614d6201f5..969ccfadc00c21cadb7c3dea79202063ea5e2fb9 100644 (file)
--- a/t/logs/bad-ldflags
+++ b/t/logs/bad-ldflags
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c

diff --git a/t/logs/bad-library b/t/logs/bad-library
index 811b71151e46f46dc94a06f9fb1cfb69bb03bc80..831afd9183bb97bdee6147511f8267e367b7a220 100644 (file)
--- a/t/logs/bad-library
+++ b/t/logs/bad-library
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -D_FORTIFY_SOURCE=2 -g -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security test.c -fPIC -DPIC -o libtest.o
 gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -Wl,relro -Wl,--as-needed -o libtest.so
 gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -Wl,--as-needed -o libtest.so

diff --git a/t/logs/bad-multiline b/t/logs/bad-multiline
index 9ecf89b8fa2b37266e3cd6373961382ed1a2d633..91f63a6a118796c45dca0e7a97baad36d6823a6e 100644 (file)
--- a/t/logs/bad-multiline
+++ b/t/logs/bad-multiline
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 # Command over multiple lines.
 gcc \
                -g -O2 -fstack-protector\

diff --git a/t/logs/c++ b/t/logs/c++
index e3828ceaaf229c647a47b76b6623f11cf657b59f..34d741917435f2f82f5a1d0aca8e4a4bbf217afe 100644 (file)
--- a/t/logs/c++
+++ b/t/logs/c++
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 checking for c++... c++
 checking whether we are using the GNU C++ compiler... yes
 checking whether c++ accepts -g... yes

diff --git a/t/logs/cc b/t/logs/cc
index 9035202484ebe5225d08f19067aeb76e04f84d0a..38e7cab845c534cd0ac7053f1ec2c3f9d961a670 100644 (file)
--- a/t/logs/cc
+++ b/t/logs/cc
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 cc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cc
 cc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 cc -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c

diff --git a/t/logs/configure b/t/logs/configure
index ac181a3039a55a5106ff52bb4755d3dff42c8be2..ff54e1cab1ef6f36110c46c8cd26df8126de256b 100644 (file)
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 # Output by configure or similar tools which should be ignored.
 
 Compiler:            gcc

diff --git a/t/logs/debian b/t/logs/debian
index 9a03ba66808f9b55f4cd2437502fa26d3ade14af..9665e8fa609c033390bd4ca8feafc6b231a5da99 100644 (file)
--- a/t/logs/debian
+++ b/t/logs/debian
@@ -1 +1,7 @@
+Build-Depends: .., gcc (>= 4:4.4.3), g++ (>= 4:4.4.3), ...
+
+dpkg-buildpackage: source package test
+
 dh_auto_configure -- CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" CPPFLAGS="-D_FORTIFY_SOURCE=2" CXXFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" LDFLAGS="-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed" ...
+
+gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c

diff --git a/t/logs/g++ b/t/logs/g++
index 4629197c69140e4b7a110786094531272c8ed5ed..7118ef130d2542a0062bf2f27e21a20245195d97 100644 (file)
--- a/t/logs/g++
+++ b/t/logs/g++
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 checking for g++... g++
 checking whether we are using the GNU C++ compiler... yes
 checking whether g++ accepts -g... yes

diff --git a/t/logs/gcc b/t/logs/gcc
index 56eb38f875ce34e9f3b1b2147122eeefb92877f5..e90dba5190fe90f42d402b314f3e3f2c5b22b1c2 100644 (file)
--- a/t/logs/gcc
+++ b/t/logs/gcc
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 checking for x86_64-linux-gnu-gcc... gcc-4.6
 
 gcc-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cc

diff --git a/t/logs/good b/t/logs/good
index 7233bc788a3ee1e0e2c76fa1f9f1fb7aef6b2a11..670766f9af87daad01bc0034e862b60f0e09f066 100644 (file)
--- a/t/logs/good
+++ b/t/logs/good
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 configure: running /bin/bash ./configure ... 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security' 'CPPFLAGS=-D_FORTIFY_SOURCE=2' 'CXXFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security' 'LDFLAGS=-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed' ...
 
 checking whether gcc accepts -g... yes

diff --git a/t/logs/good-all b/t/logs/good-all
index 84aca21b41d1e36e87f02f0c23acbe9699be0c07..017fff63a8f54886cd524673c67ffad782a8bf19 100644 (file)
--- a/t/logs/good-all
+++ b/t/logs/good-all
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c

diff --git a/t/logs/good-bindnow b/t/logs/good-bindnow
index eaa168d370ea905160fcdeff06a436b62757cbb4..556668bde8f420d49562fdecf6e8932343834ecb 100644 (file)
--- a/t/logs/good-bindnow
+++ b/t/logs/good-bindnow
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c

diff --git a/t/logs/good-library b/t/logs/good-library
index 5447520651b92e3fb28e0f0e69de3b2a46f66286..7d6a0ec88fce38575024ffa09a24710385c31a65 100644 (file)
--- a/t/logs/good-library
+++ b/t/logs/good-library
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 # -fPIC and -fPIE conflict with each other and -fPIE is not necessary for
 # libraries.
 gcc -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security test.c -fPIC -DPIC -o libtest.o

diff --git a/t/logs/good-multiline b/t/logs/good-multiline
index e97595872fae6ab852e0b94e7aadf369488c055d..39bba6b1b27dedc85c7b6ecc6a3918db02663ae7 100644 (file)
--- a/t/logs/good-multiline
+++ b/t/logs/good-multiline
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 # Command over multiple lines.
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 \
 \

diff --git a/t/logs/good-pie b/t/logs/good-pie
index fb12870a4bdea117bb709b91be17858de86ad0dc..e593530dbfdbae1ee83318004f2cdbd193bc4f1f 100644 (file)
--- a/t/logs/good-pie
+++ b/t/logs/good-pie
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c

diff --git a/t/logs/libtool b/t/logs/libtool
index 699d5270c9e63884c44c7f8a53b4435a23ed1acd..3849e6f22a381b55160a49f116d6cf1c9b8f791b 100644 (file)
--- a/t/logs/libtool
+++ b/t/logs/libtool
@@ -1,3 +1,5 @@
+dpkg-buildpackage: source package test
+
 /bin/bash ../../libtool --tag=CC   --mode=compile x86_64-linux-gnu-gcc -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -c test.c
 /bin/bash ../../libtool --tag=CC   --mode=compile x86_64-linux-gnu-g++ -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -c test.cpp
 /bin/bash ../../libtool --tag=CC   --mode=compile gcc-4.6 -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -c test.c

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index aba204b83326bd38b7c0b443f54d1eb6244d3df1..c54e199e3adf750196c20310e889f058675c2ab5 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -1,5 +1,7 @@
 # We must ensure a verbose build is used.
 
+dpkg-buildpackage: source package test
+
 
 checking if you want to see long compiling messages... yes
 checking if you want to see long compiling messages... no

diff --git a/t/tests.t b/t/tests.t
index 35df8353e29f14d787d25988ce2abecd557d0997..5567979cc30b6c8c9dbad015448d9398cd32a1d6 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -357,8 +357,8 @@ LDFLAGS missing (-fPIE -pie -Wl,-z,now): gcc-4.6 -Wl,-z,defs test-a.o test-b.o t
 
 # debian
 
-is_blhc 'debian', '--all', 1,
-        'No compiler commands!
+is_blhc 'debian', '', 8,
+        'CPPFLAGS missing (-D_FORTIFY_SOURCE=2): gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
 ';