X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=t%2Ftests.t;h=0b98fe3648a00e9be9a70b02bbc605d6308642be;hp=949ed88b6b111e4beef32c0354fdd7224117a668;hb=f61763f97aa10059755d434556945465a4984aab;hpb=bbdf77da3205abbc957d6b720e01f6d390db46dc

diff --git a/t/tests.t b/t/tests.t
index 949ed88..0b98fe3 100644
--- a/t/tests.t
+++ b/t/tests.t
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 102;
+use Test::More tests => 110;
 
 
 sub is_blhc {
@@ -377,6 +377,8 @@ NONVERBOSE BUILD:       [CC]   src/test-b.o
 NONVERBOSE BUILD:       [CC]   src/test_c.o
 NONVERBOSE BUILD:       [LD]   src/test.o
 NONVERBOSE BUILD: CC modules/server/test.c
+NONVERBOSE BUILD:     C++      test/test.o
+NONVERBOSE BUILD: C++ test.cpp
 NONVERBOSE BUILD: Compiling test/test.cc to ../build/test/test.o
 NONVERBOSE BUILD: Building shared library ../build/test/libtest.so.1.2.3
 NONVERBOSE BUILD: Compiling test.cc to ../build/test/test.o
@@ -529,15 +531,19 @@ my $arch_avr32 =
 is_blhc 'arch-avr32', '', 8,
         $arch_avr32;
 
-is_blhc 'arch-i386', '', 8,
+my $arch_i386 =
         'CFLAGS missing (-fstack-protector): gcc -D_FORTIFY_SOURCE=2 -g -O2 -fPIE --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
 LDFLAGS missing (-pie): gcc -fPIE -Wl,-z,relro -Wl,-z,now -o test test.o
 ';
+is_blhc 'arch-i386', '', 8,
+        $arch_i386;
 
-is_blhc 'arch-ia64', '', 8,
+my $arch_ia64 =
         'CFLAGS missing (-fPIE): gcc -D_FORTIFY_SOURCE=2 -g -O2 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
 LDFLAGS missing (-pie): gcc -fPIE -o test test.o
 ';
+is_blhc 'arch-ia64', '', 8,
+        $arch_ia64;
 
 is_blhc 'arch-mipsel', '', 8,
         'CFLAGS missing (-Werror=format-security): gcc -D_FORTIFY_SOURCE=2 -g -O2 -Wformat -Wformat-security -Wall -c test.c
@@ -563,6 +569,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-cmake', '', 32,
+        'INVALID CMAKE: 2.8.7-2
+';
+
 my $debian_hardening_wrapper =
         'HARDENING WRAPPER: no checks possible, aborting
 ';
@@ -591,6 +601,14 @@ is_blhc 'buildd-verbose-build', '--buildd', 4,
         'W-compiler-flags-hidden 1 (of 5) hidden
 ';
 
+is_blhc 'make', '--buildd', 1,
+        'W-no-compiler-commands
+';
+
+is_blhc 'debian-cmake', '--buildd', 32,
+        'W-invalid-cmake-used 2.8.7-2
+';
+
 
 # multiple files
 
@@ -599,6 +617,9 @@ is_blhc ['good', 'good-pie', 'good-bindnow', 'good-all', 'good-multiline', 'good
 is_blhc ['good-all', 'good-library'], '--all', 0,
         '';
 
+is_blhc ['arch-i386', 'arch-ia64'], '', 8,
+        $arch_i386 . $arch_ia64;
+
 # No exit when multiple files are specified.
 is_blhc ['bad-ldflags', 'empty', 'arch-avr32', 'debian-hardening-wrapper'], '', 25,
         $bad_ldflags