X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=t%2Flogs%2Fbad-multiline;h=a09d5f0bbd6599852643df4ae1708fa6d8678de2;hp=cb856238978cefa768793005c1cf4cabc8ffd9eb;hb=f1ac73364a8d0a20e279328db6b6e1e8dbfe9a4e;hpb=b35dc81d990e292f93b2dcf2cdfe46b1b4f1260c

diff --git a/t/logs/bad-multiline b/t/logs/bad-multiline
index cb85623..a09d5f0 100644
--- a/t/logs/bad-multiline
+++ b/t/logs/bad-multiline
@@ -3,12 +3,12 @@ dpkg-buildpackage: source package test
 # Command over multiple lines.
 gcc \
         	-g -O2 -fstack-protector-strong\
-    -Wformat-security\
+    -fstack-clash-protection -Wformat-security\
 -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
-gcc -g -O2 -Wformat -Wformat-security -Werror=format-security\
+gcc -g -O2 -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security\
 -D_FORTIFY_SOURCE=2\
 -c test-b.c
-gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.c
+gcc -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.c
 gcc -Wl,-z,relro -o test test-a.o test-b.o test-c.o\
 	-ltest
 gcc -o\
@@ -22,14 +22,14 @@ test test-b.o test-a.o test-c.c\
 	
 
 # Multiple commands in a single line.
-gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -c test-a.c; gcc -D_FORTIFY_SOURCE=2 -c test-b.c
-gcc -g -O2 -fstack-protector-strong -Wformat -D_FORTIFY_SOURCE=2 -c test-a.c ; gcc -Wformat-security -Werror=format-security -c test-b.c
-gcc -g -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -c test-a.c;\
+gcc -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -c test-a.c; gcc -D_FORTIFY_SOURCE=2 -c test-b.c
+gcc -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -D_FORTIFY_SOURCE=2 -c test-a.c ; gcc -Wformat-security -Werror=format-security -c test-b.c
+gcc -g -fstack-protector-strong -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -c test-a.c;\
 gcc -O2 -D_FORTIFY_SOURCE=2 -c test-b.c
-gcc -g -O2 -Wformat -Wformat-security -Werror=format-security -c test-a.c ; \
+gcc -g -O2 -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -c test-a.c ; \
 gcc -D_FORTIFY_SOURCE=2 -c test-b.c
 # Escaped ";" - not really useful, just to check it works.
-gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security \; -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-a.c
+gcc -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Wformat-security \; -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-a.c
 
 
 if ./bin-aux/missing --run makeinfo \
@@ -39,7 +39,7 @@ then \
 else
     echo bad; \
 fi; \
-gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-b.c
+gcc -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-b.c
 
-gcc -c test.c `echo -g -O2 -fstack-protector-strong echo -Wformat -Wformat-security -Werror=format-security | sed 's/.../; s/.../'` -o test.o
-gcc -c test.c `echo -g -O2 -fstack-protector-strong echo -Wformat -Wformat-security -Werror=format-security | sed "s/.../; s/.../"` -o test.o
+gcc -c test.c `echo -g -O2 -fstack-protector-strong -fstack-clash-protection echo -Wformat -Wformat-security -Werror=format-security | sed 's/.../; s/.../'` -o test.o
+gcc -c test.c `echo -g -O2 -fstack-protector-strong -fstack-clash-protection echo -Wformat -Wformat-security -Werror=format-security | sed "s/.../; s/.../"` -o test.o