X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=t%2Ftests.t;h=3b9c332292db849b0a7b9e88b0e7cd2e2305b22b;hb=f939b4685a7cb1e1003fbd81a4f136c254b554a4;hp=ff9e3edb6f2aa9e1b267b2620d69248672c32378;hpb=7e0037c0788371d6911d2dae5e919bd1b963aedb;p=blhc%2Fblhc.git

diff --git a/t/tests.t b/t/tests.t
index ff9e3ed..3b9c332 100644
--- a/t/tests.t
+++ b/t/tests.t
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 86;
+use Test::More tests => 90;
 
 
 sub is_blhc {
@@ -40,17 +40,16 @@ sub is_blhc {
 is_blhc 'empty', '--invalid', 2,
         'Unknown option: invalid
 Usage:
-    blhc [-h -? --help]
+    blhc [options] <dpkg-buildpackage build log file>
 
-    blhc [--pie] [--bindnow] [--all]
-
-        --help                  available options
-        --version               version number and license
-        --pie                   force +pie check
-        --bindnow               force +bindbow check
         --all                   force +all (+pie, +bindnow) check
         --arch                  set architecture (autodetected)
+        --bindnow               force +bindbow check
         --buildd                parser mode for buildds
+        --color                 use colored output
+        --pie                   force +pie check
+        --help                  available options
+        --version               version number and license
 
 ';
 
@@ -397,12 +396,17 @@ CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O
 ';
 
 
-# configure
+# configure/make
 
 is_blhc 'configure', '', 1,
         'No compiler commands!
 ';
 
+is_blhc 'make', '', 1,
+        'No compiler commands!
+';
+
+
 
 # cc
 
@@ -446,6 +450,9 @@ LDFLAGS missing (-fPIE -pie -Wl,-z,now): c++ -Wl,-z,defs test-a.o test-b.o test-
 CFLAGS missing (-g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security): c++\     test.c
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): c++\     test.c
 LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now): c++\     test.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security): c++\     test.c++
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2): c++\     test.c++
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now): c++\     test.c++
 CFLAGS missing (-fPIE -Wformat): c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cpp
 CFLAGS missing (-fPIE --param=ssp-buffer-size=4): c++-4.6 -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.cpp
 CFLAGS missing (-fPIE -Werror=format-security): c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.cpp
@@ -540,6 +547,10 @@ CPPFLAGS missing (-D_FORTIFY_SOURCE=2): gcc -c `dpkg-buildflags --get LDFLAGS` t
 LDFLAGS missing (-Wl,-z,relro): gcc -o test test.o `dpkg-buildflags --get CFLAGS`
 ';
 
+is_blhc 'debian-hardening-wrapper', '', 16,
+        'HARDENING WRAPPER: no checks possible, aborting
+';
+
 
 # buildd support