Also split commands on && and ||

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

diff --git a/t/tests.t b/t/tests.t
index 2e2b9d7eb119d21f1aa059cf1a813d508a8b2ff6..7e0a7edd5ee675e874b3af9d93ed303d9d9a3737 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -1,6 +1,6 @@
 # Tests for blhc.
 #
-# Copyright (C) 2012-2019  Simon Ruderich
+# Copyright (C) 2012-2020  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
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 238;
+use Test::More tests => 244;
 
 
 sub is_blhc {
@@ -67,7 +67,7 @@ is_blhc '', '', 2,
         $usage;
 
 is_blhc '', '--version', 0,
-        'blhc 0.09  Copyright (C) 2012-2019  Simon Ruderich
+        'blhc 0.12  Copyright (C) 2012-2020  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
@@ -162,6 +162,17 @@ is_blhc 'arch-i386', '--ignore-arch-flag amd64:-fstack-protector-strong --ignore
 LDFLAGS missing (-pie): gcc -fPIE -Wl,-z,relro -Wl,-z,now -o test test.o
 ';
 
+# Ignore certain lines (through inline command).
+
+is_blhc 'ignore-line-inline', '', 8,
+        'CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):     ./prepare-script gcc test-a.c test-b.c test-c.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):     ./prepare-script gcc test-a.c test-b.c test-c.c
+LDFLAGS missing (-Wl,-z,relro):     ./prepare-script gcc test-a.c test-b.c test-c.c
+';
+
+is_blhc 'ignore-line-inline2', '', 0,
+        '';
+
 
 # Ignore certain lines.
 
@@ -435,6 +446,15 @@ CPPFLAGS missing (-D_FORTIFY_SOURCE=2): gcc test.c -o test.output
 LDFLAGS missing (-Wl,-z,relro): gcc test.c -o test.output
 CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security): (gcc -Wl,-z,relro -o test.output test.c)
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): (gcc -Wl,-z,relro -o test.output test.c)
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-comma.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-comma.c
+LDFLAGS missing (-Wl,-z,relro):  gcc test-comma.c
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-and.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-and.c
+LDFLAGS missing (-Wl,-z,relro):  gcc test-and.c
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-or.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-or.c
+LDFLAGS missing (-Wl,-z,relro):  gcc test-or.c
 ';
 is_blhc 'bad-cflags', '--pie', 8,
         'CFLAGS missing (-fPIE -Wformat): gcc -g -O2 -fstack-protector-strong -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
@@ -453,6 +473,15 @@ LDFLAGS missing (-fPIE -pie -Wl,-z,relro): gcc test.c -o test.output
 CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security): (gcc -Wl,-z,relro -o test.output test.c)
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): (gcc -Wl,-z,relro -o test.output test.c)
 LDFLAGS missing (-fPIE -pie): (gcc -Wl,-z,relro -o test.output test.c)
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-comma.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-comma.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro):  gcc test-comma.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-and.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-and.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro):  gcc test-and.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-or.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-or.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro):  gcc test-or.c
 ';
 is_blhc 'bad-cflags', '--bindnow', 8,
         'CFLAGS missing (-Wformat): gcc -g -O2 -fstack-protector-strong -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
@@ -472,6 +501,15 @@ LDFLAGS missing (-Wl,-z,relro -Wl,-z,now): gcc test.c -o test.output
 CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security): (gcc -Wl,-z,relro -o test.output test.c)
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): (gcc -Wl,-z,relro -o test.output test.c)
 LDFLAGS missing (-Wl,-z,now): (gcc -Wl,-z,relro -o test.output test.c)
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-comma.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-comma.c
+LDFLAGS missing (-Wl,-z,relro -Wl,-z,now):  gcc test-comma.c
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-and.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-and.c
+LDFLAGS missing (-Wl,-z,relro -Wl,-z,now):  gcc test-and.c
+CFLAGS missing (-g -O2 -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-or.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-or.c
+LDFLAGS missing (-Wl,-z,relro -Wl,-z,now):  gcc test-or.c
 ';
 is_blhc 'bad-cflags', '--pie --bindnow', 8,
         'CFLAGS missing (-fPIE -Wformat): gcc -g -O2 -fstack-protector-strong -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
@@ -491,6 +529,15 @@ LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now): gcc test.c -o test.output
 CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security): (gcc -Wl,-z,relro -o test.output test.c)
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): (gcc -Wl,-z,relro -o test.output test.c)
 LDFLAGS missing (-fPIE -pie -Wl,-z,now): (gcc -Wl,-z,relro -o test.output test.c)
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-comma.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-comma.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now):  gcc test-comma.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-and.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-and.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now):  gcc test-and.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security):  gcc test-or.c
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2):  gcc test-or.c
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now):  gcc test-or.c
 ';
 is_blhc 'bad-cflags-stackprotector', '', 8,
         'CFLAGS missing (-fstack-protector-strong): gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c -fno-stack-protector test-a.c
@@ -633,10 +680,12 @@ NONVERBOSE BUILD: Compiling test_file.cxx...
 CXXFLAGS missing (-fstack-protector-strong): g++ -g -O2 -fPIC -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test_file.cxx
 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-strong -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-strong -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
+CXXFLAGS missing (-Wformat):  /usr/bin/c++ -g -O2 -fstack-protector-strong -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):  /usr/bin/gcc -g -O2 -fstack-protector-strong -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
 NONVERBOSE BUILD: [  3%] Building CXX object scribus/text/CMakeFiles/scribus_text_lib.dir/frect.cpp.o
+NONVERBOSE BUILD: [ 1/13] Compiling src/instance.c
+NONVERBOSE BUILD: [11/13] Compiling suil.pc.in
 ';
 
 is_blhc 'parallel', '', 0, '';
@@ -787,6 +836,16 @@ LDFLAGS missing (-Wl,-z,relro): gfortran -g -w -O2 -Wtabs -ffixed-line-length-13
 CFLAGS missing (-fstack-protector-strong): mpifort -cpp -DDOUB -g -O2 -fdebug-prefix-map=/«PKGBUILDDIR»=. -c -o transform.o transform.f90
 ';
 
+is_blhc 'fortran-no-build-deps', '', 8,
+        'CFLAGS missing (-fstack-protector-strong): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132 -Wl,-z,relro -o balls balls.f
+CFLAGS missing (-fstack-protector-strong): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132  -c -o quadric.o quadric.f
+CFLAGS missing (-fstack-protector-strong): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132  -c -o suv.o suv.f
+CFLAGS missing (-fstack-protector-strong): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132 \ rastep.f quadric.o suv.o -Wl,-z,relro \ -o rastep
+CFLAGS missing (-fstack-protector-strong): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132  -c -o render.o render.f
+LDFLAGS missing (-Wl,-z,relro): gfortran -g -w -O2 -Wtabs -ffixed-line-length-132 -fstack-protector-strong -o balls-without-ldflags balls.f
+CFLAGS missing (-fstack-protector-strong): mpifort -cpp -DDOUB -g -O2 -fdebug-prefix-map=/«PKGBUILDDIR»=. -c -o transform.o transform.f90
+';
+
 
 # libtool