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

diff --git a/t/logs/bad-multiline b/t/logs/bad-multiline
index e7c179b..cb85623 100644
--- a/t/logs/bad-multiline
+++ b/t/logs/bad-multiline
@@ -2,13 +2,13 @@ dpkg-buildpackage: source package test
 
 # Command over multiple lines.
 gcc \
-        	-g -O2 -fstack-protector\
-    --param=ssp-buffer-size=4 -Wformat-security\
+        	-g -O2 -fstack-protector-strong\
+    -Wformat-security\
 -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
-gcc -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security\
+gcc -g -O2 -Wformat -Wformat-security -Werror=format-security\
 -D_FORTIFY_SOURCE=2\
 -c test-b.c
-gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.c
+gcc -g -O2 -fstack-protector-strong -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 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-a.c; gcc -D_FORTIFY_SOURCE=2 -c test-b.c
-gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -D_FORTIFY_SOURCE=2 -c test-a.c ; gcc -Wformat-security -Werror=format-security -c test-b.c
-gcc -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-a.c;\
+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 -O2 -D_FORTIFY_SOURCE=2 -c test-b.c
-gcc -g -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c test-a.c ; \
-gcc -D_FORTIFY_SOURCE=2 -fstack-protector -c test-b.c
+gcc -g -O2 -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 --param=ssp-buffer-size=4 -Wformat -Wformat-security \; -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-a.c
+gcc -g -O2 -fstack-protector-strong -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 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-b.c
+gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=1 -c test-b.c
 
-gcc -c test.c `echo -g -O2 -fstack-protector --param=ssp-buffer-size=4 echo -Wformat -Wformat-security -Werror=format-security | sed 's/.../; s/.../'` -o test.o
-gcc -c test.c `echo -g -O2 -fstack-protector --param=ssp-buffer-size=4 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 echo -Wformat -Wformat-security -Werror=format-security | sed "s/.../; s/.../"` -o test.o