Fix argv hacking in tst_benchlibcallgrind.cpp

It unconditionally added -callgrind to its own command-line options,
but the way testlib handles this argument is, in QTest::qRun(), to
re-run the program under the control of valgrind --tool=callgrind,
removing the -callgrind command-line option from the test and adding
-callgrindchild to its command-line options. So we shouldn't re-add
the -callgrind option in the resulting recursive call.

The test now runs quickly, producing sensible output, where previously
it took a very long time. Revised the drivers to reflect this
speed-up, but continue skipping the non-.txt formats to save the need
for variant-output files for many formats. To match that, removed the
unused non-.txt results files.

Change-Id: Iaa99c1b5964d50bccfc6076a21896791b6bbf289
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 0 insertions, 13 deletions

diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
deleted file mode 100644
index 0850e74733..0000000000
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="1" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/>
-  <testcase name="twoHundredMillionInstructions" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@">
-    <skipped message="This test is only defined for gcc and x86."/>
-  </testcase>
-  <testcase name="cleanupTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/>
-</testsuite>