Also use buildd's "Architecture" header to detect architecture.

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

diff --git a/t/tests.t b/t/tests.t
index e238b1ad58aa188ec45cc51ef02c487f82b821ff..cfe2f9dbb082724ddf068ca4f48f3b4564feaf81 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 130;
+use Test::More tests => 136;
 
 
 sub is_blhc {
@@ -454,6 +454,8 @@ 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: Building program ../build/bin/test
+NONVERBOSE BUILD: Compiling test/test.cc to ../build/test/test.o
 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
@@ -475,12 +477,10 @@ CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O
 # configure/make
 
 is_blhc 'configure', '', 1,
-        'No compiler commands!
-';
+        $empty;
 
 is_blhc 'make', '', 1,
-        'No compiler commands!
-';
+        $empty;
 
 
 
@@ -633,6 +633,25 @@ LDFLAGS missing (-pie -Wl,-z,relro): gcc -fPIE -o test test.o
 ';
 
 
+# ignore architecture
+
+is_blhc ['arch-avr32', 'arch-i386', 'empty', 'arch-mipsel'],
+        '--ignore-arch avr32 --ignore-arch mipsel',
+        9,
+        "checking './t/logs/arch-avr32'...\n"
+        . "ignoring architecture 'avr32'\n"
+        . "checking './t/logs/arch-i386'...\n"
+        . $arch_i386
+        . "checking './t/logs/empty'...\n"
+        . $empty
+        . "checking './t/logs/arch-mipsel'...\n"
+        . "ignoring architecture 'mipsel'\n"
+        ;
+
+is_blhc 'buildd-dpkg-dev', '--ignore-arch i386', 0,
+        "ignoring architecture 'i386'\n";
+
+
 # debian
 
 is_blhc 'debian', '', 8,
@@ -660,6 +679,12 @@ is_blhc 'debian-hardening-wrapper', '', 16,
         $debian_hardening_wrapper;
 
 
+# false positives
+
+is_blhc 'false-positives', '', 1,
+        $empty;
+
+
 # buildd support
 
 is_blhc 'empty', '--buildd', 1,