From 9322b96f809a11600ff89a7f808fb0bac6ae2334 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 15 Dec 2022 16:41:32 -0700 Subject: [PATCH] Use require !skip_perf_tests This changes some tests to use "require !skip_perf_tests". --- gdb/testsuite/gdb.perf/backtrace.exp | 4 +--- gdb/testsuite/gdb.perf/disassemble.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-runto-main.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-select-file.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-runto-main.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-select-file.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2.exp | 4 +--- gdb/testsuite/gdb.perf/single-step.exp | 4 +--- gdb/testsuite/gdb.perf/skip-command.exp | 4 +--- gdb/testsuite/gdb.perf/skip-prologue.exp | 4 +--- gdb/testsuite/gdb.perf/solib.exp | 4 +--- gdb/testsuite/gdb.perf/template-breakpoints.exp | 4 +--- 21 files changed, 21 insertions(+), 63 deletions(-) diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp index 0602beca648..d8b046b5cd1 100644 --- a/gdb/testsuite/gdb.perf/backtrace.exp +++ b/gdb/testsuite/gdb.perf/backtrace.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/disassemble.exp b/gdb/testsuite/gdb.perf/disassemble.exp index 1886028d32b..ee33dcf0481 100644 --- a/gdb/testsuite/gdb.perf/disassemble.exp +++ b/gdb/testsuite/gdb.perf/disassemble.exp @@ -17,9 +17,7 @@ # some large functions in GDB. load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests global GDB diff --git a/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp b/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp index b3b3948fa42..1c17cd7f450 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-null-lookup.py NullLookup diff --git a/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp b/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp index 7f7ca513298..ae175f3a1ef 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp @@ -21,8 +21,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-pervasive-typedef.py PervasiveTypedef diff --git a/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp b/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp index e5fbe93f4cd..54f7f00b42b 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-print-cerr.py PrintCerr diff --git a/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp b/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp index a9217625754..f37cead361f 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-ptype-string.py GmonsterPtypeString diff --git a/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp b/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp index f416af13d24..8b4311ed43d 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-runto-main.py GmonsterRuntoMain diff --git a/gdb/testsuite/gdb.perf/gmonster1-select-file.exp b/gdb/testsuite/gdb.perf/gmonster1-select-file.exp index e89e76c1a81..71b3d61b772 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-select-file.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-select-file.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-select-file.py GmonsterSelectFile diff --git a/gdb/testsuite/gdb.perf/gmonster1.exp b/gdb/testsuite/gdb.perf/gmonster1.exp index e918d9cd9de..900452501eb 100644 --- a/gdb/testsuite/gdb.perf/gmonster1.exp +++ b/gdb/testsuite/gdb.perf/gmonster1.exp @@ -36,9 +36,7 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests if ![info exists MONSTER] { set MONSTER "n" diff --git a/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp b/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp index e8d1631b422..353e6f12202 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-null-lookup.py NullLookup diff --git a/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp b/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp index 63eecc461aa..e37c1a4b2f6 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp @@ -21,8 +21,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-pervasive-typedef.py PervasiveTypedef diff --git a/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp b/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp index 375f5b472e3..ccb9e733fb4 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-print-cerr.py PrintCerr diff --git a/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp b/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp index 5ab0dfc6dd3..a21fa349b7a 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-ptype-string.py GmonsterPtypeString diff --git a/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp b/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp index 641e185ec09..05e2ec37dca 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-runto-main.py GmonsterRuntoMain diff --git a/gdb/testsuite/gdb.perf/gmonster2-select-file.exp b/gdb/testsuite/gdb.perf/gmonster2-select-file.exp index 2aabfde0340..869f048e091 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-select-file.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-select-file.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-select-file.py GmonsterSelectFile diff --git a/gdb/testsuite/gdb.perf/gmonster2.exp b/gdb/testsuite/gdb.perf/gmonster2.exp index 618b5ce6116..bb0b76994b9 100644 --- a/gdb/testsuite/gdb.perf/gmonster2.exp +++ b/gdb/testsuite/gdb.perf/gmonster2.exp @@ -36,9 +36,7 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests if ![info exists MONSTER] { set MONSTER "n" diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp index 64d1a907fc8..b46f838ea8c 100644 --- a/gdb/testsuite/gdb.perf/single-step.exp +++ b/gdb/testsuite/gdb.perf/single-step.exp @@ -19,9 +19,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp index 07498ecd687..c0019331cac 100644 --- a/gdb/testsuite/gdb.perf/skip-command.exp +++ b/gdb/testsuite/gdb.perf/skip-command.exp @@ -25,9 +25,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .cc skip-funcs.cc set executable $testfile diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp index 49356ec81a5..aaa0bbfe6ff 100644 --- a/gdb/testsuite/gdb.perf/skip-prologue.exp +++ b/gdb/testsuite/gdb.perf/skip-prologue.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp index 5ebc08be763..95d014090f8 100644 --- a/gdb/testsuite/gdb.perf/solib.exp +++ b/gdb/testsuite/gdb.perf/solib.exp @@ -24,9 +24,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp index f3aa124d3be..fae5c24681c 100644 --- a/gdb/testsuite/gdb.perf/template-breakpoints.exp +++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .cc set executable $testfile -- 2.30.2