[src/trunk]: src/tests/usr.bin Put the sprinkled -static in the right place, ...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da041efb03ca
branches:  trunk
changeset: 366759:da041efb03ca
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Jun 12 15:08:38 2022 +0000

description:
Put the sprinkled -static in the right place, i.e. fix up previous.

Thanks to rillig for spotting my mistake.

diffstat:

 tests/usr.bin/c++/t_call_once.sh         |  6 +++---
 tests/usr.bin/c++/t_call_once2.sh        |  6 +++---
 tests/usr.bin/c++/t_cxxruntime.sh        |  6 +++---
 tests/usr.bin/c++/t_hello.sh             |  6 +++---
 tests/usr.bin/c++/t_pthread_once.sh      |  6 +++---
 tests/usr.bin/c++/t_static_destructor.sh |  6 +++---
 tests/usr.bin/cc/t_hello.sh              |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diffs (180 lines):

diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_call_once.sh
--- a/tests/usr.bin/c++/t_call_once.sh  Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_call_once.sh  Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_call_once.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_call_once.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -111,7 +111,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o call_once test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o call_once test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once
 }
 
@@ -138,7 +138,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o call_once test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o call_once test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once
 }
 
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_call_once2.sh
--- a/tests/usr.bin/c++/t_call_once2.sh Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_call_once2.sh Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_call_once2.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_call_once2.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -154,7 +154,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o call_once2 test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o call_once2 test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
 }
 
@@ -198,7 +198,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o call_once2 test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static-m32 -pg -o call_once2 test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once2
        atf_expect_fail "The combination of 32-bit and profiling should be fail"
 }
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_cxxruntime.sh
--- a/tests/usr.bin/c++/t_cxxruntime.sh Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_cxxruntime.sh Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_cxxruntime.sh,v 1.6 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_cxxruntime.sh,v 1.7 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -104,7 +104,7 @@
 #include <iostream>
 int main(void) {std::cout << "hello world" << std::endl;exit(0);}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"hello world\n" ./hello
 }
 
@@ -126,7 +126,7 @@
 #include <iostream>
 int main(void) {std::cout << "hello world" << std::endl;exit(0);}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"hello world\n" ./hello
 }
 
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_hello.sh
--- a/tests/usr.bin/c++/t_hello.sh      Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_hello.sh      Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_hello.sh,v 1.6 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_hello.sh,v 1.7 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -101,7 +101,7 @@
 #include <stdlib.h>
 int main(void) {printf("hello world\n");exit(0);}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"hello world\n" ./hello
 }
 
@@ -122,7 +122,7 @@
 #include <stdlib.h>
 int main(void) {printf("hello world\n");exit(0);}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static  -m32 -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"hello world\n" ./hello
 }
 
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_pthread_once.sh
--- a/tests/usr.bin/c++/t_pthread_once.sh       Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_pthread_once.sh       Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_pthread_once.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_pthread_once.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2018 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -109,7 +109,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o pthread_once test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o pthread_once test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once
 }
 
@@ -135,7 +135,7 @@
         return 0;
 }
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o pthread_once test.cpp -pthread
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o pthread_once test.cpp -pthread
        atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once
 }
 
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/c++/t_static_destructor.sh
--- a/tests/usr.bin/c++/t_static_destructor.sh  Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/c++/t_static_destructor.sh  Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_static_destructor.sh,v 1.5 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_static_destructor.sh,v 1.6 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -122,7 +122,7 @@
 };
 int main(void) {struct B b;return 0;}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"CTOR A\nCTOR B\nDTOR B:10\nDTOR A:20\n" ./hello
 }
 
@@ -153,7 +153,7 @@
 };
 int main(void) {struct B b;return 0;}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore c++ -m32 -pg -o hello test.cpp
+       atf_check -s exit:0 -o ignore -e ignore c++ -static -m32 -pg -o hello test.cpp
        atf_check -s exit:0 -o inline:"CTOR A\nCTOR B\nDTOR B:10\nDTOR A:20\n" ./hello
 }
 
diff -r fa7c7151db59 -r da041efb03ca tests/usr.bin/cc/t_hello.sh
--- a/tests/usr.bin/cc/t_hello.sh       Sun Jun 12 15:03:27 2022 +0000
+++ b/tests/usr.bin/cc/t_hello.sh       Sun Jun 12 15:08:38 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_hello.sh,v 1.11 2022/06/12 08:55:36 skrll Exp $
+#      $NetBSD: t_hello.sh,v 1.12 2022/06/12 15:08:38 skrll Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -71,7 +71,7 @@
 #include <stdlib.h>
 int main(void) {printf("hello world\n");exit(0);}
 EOF
-       atf_check -s exit:0 -static -o ignore -e ignore cc -o hello -pg test.c
+       atf_check -s exit:0 -o ignore -e ignore cc -static -o hello -pg test.c
        atf_check -s exit:0 -o inline:"hello world\n" ./hello
        atf_check -s exit:0 -o ignore -e ignore cc -o hello2 -fprofile-generate test.c
        atf_check -s exit:0 -o inline:"hello world\n" ./hello2