From 1c24b4b8d9fe16eaa4bc1598df117593d814bf50 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 28 Sep 2021 17:16:45 +0200 Subject: Match up testlib selftest's lists of generated files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The actual files present for expected data, the test function that selected which tests to skip and the python function to select which to not generate data for weren't in sync with one another. The test-code's reason for omitting three tests was that we lacked data files for them. So generate those and skip that exception. The generator script's code to decide which to generate didn't exclude anything like as many, so update it to match the test-code. In the process, save repeating a startswith test that was used both positively and negatively, unifying two conditions. Extend the generator script's handling of its --skip-callgrind option by auto-setting that option if valgrind isn't available, to match the driver program's similar skipping. The generated data included many files for tests we skip and, as mentioned already, lacked files for some tests we only skipped because we lacked them. Remove the unused files, add the lacking ones. Change-Id: If91696cdd95b7b0d5f3d686bff839f1bf15e121b Reviewed-by: Tor Arne Vestbø --- .../testlib/selftests/expected_benchlibwalltime.teamcity | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity (limited to 'tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity') diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity b/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity deleted file mode 100644 index 4c5d9667e7..0000000000 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity +++ /dev/null @@ -1,12 +0,0 @@ -##teamcity[testSuiteStarted name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime'] -##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibWalltime'] -##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibWalltime'] -##teamcity[testStarted name='waitForOneThousand()' flowId='tst_BenchlibWalltime'] -##teamcity[testFinished name='waitForOneThousand()' flowId='tst_BenchlibWalltime'] -##teamcity[testStarted name='waitForFourThousand()' flowId='tst_BenchlibWalltime'] -##teamcity[testFinished name='waitForFourThousand()' flowId='tst_BenchlibWalltime'] -##teamcity[testStarted name='qbenchmark_once()' flowId='tst_BenchlibWalltime'] -##teamcity[testFinished name='qbenchmark_once()' flowId='tst_BenchlibWalltime'] -##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibWalltime'] -##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibWalltime'] -##teamcity[testSuiteFinished name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime'] -- cgit v1.2.3