Remove -Wformat-security from expected CFLAGS.

[blhc/blhc.git] / t / logs / good

diff --git a/t/logs/good b/t/logs/good
index e863207e421282b44d68124ecd64a4fe04ca5974..0be962c5ddd47214a122d68bfff52d91969e457f 100644 (file)
--- a/t/logs/good
+++ b/t/logs/good
@@ -12,6 +12,14 @@ gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-securit
 gcc -g -O3 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-d.c
 gcc -Wl,-z,relro -o test test-a.o test-b.o test-c.o -ltest
 
+# -Wformat-security is implied by -Werror=format-security and no longer used
+# since dpkg >= 1.16.3.
+gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.c
+gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
+gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c
+gcc -g -O3 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-d.c
+gcc -Wl,-z,relro -o test test-a.o test-b.o test-c.o -ltest
+
 # Compiling and linking in one step must also check CFLAGS/CPPFLAGS.
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -Wl,-z,relro -o test test.c -ltest
 gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -shared -fPIC -Wl,-z,relro -o test.so test.c -ltest
@@ -21,8 +29,8 @@ g++  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-securi
 
 g++  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -pthread -Wl,-z,relro ../src/test/objs/test.o -o ../src/test/bin/test
 
-gcc -c -o test test.S
-gcc -D_FORTIFY_SOURCE=2 -c -o test test.s
+gcc -D_FORTIFY_SOURCE=2 -c -o test.o test.S
+gcc -c -o test.o test.s
 
 gcc -fPIC -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -c -D_FORTIFY_SOURCE=2 ../../../../src/test/test.c -o test.so.o
 
@@ -30,6 +38,8 @@ gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-securit
 
 gcc -E -D_FORTIFY_SOURCE=2 test.c
 
+gcc -S -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 test.c
+
 gcc -Wl,-z,relro -o test test.cpp.o
 
 command --cc test