Update expected results for clang symbols

Apparently newer elfutils or demangling contains a fix for the weird
complex symbols encountered in clang-compiled binaries. Now, the
symbol is better readable:

Before: `doublecomplex `
After: `double _Complex`

Update the testdata accordingly, instead of failing. To keep backwards
compatibility, replace the old form to the new form in the actual file
output.

Change-Id: I49bc956f5f2032ae7d71c59e7d6c82bc65d81e81
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 18 insertions, 15 deletions

diff --git a/tests/auto/perfdata/tst_perfdata.cpp b/tests/auto/perfdata/tst_perfdata.cpp
index 353a060..01f75b9 100644
--- a/tests/auto/perfdata/tst_perfdata.cpp
+++ b/tests/auto/perfdata/tst_perfdata.cpp
@@ -212,8 +212,6 @@ void TestPerfData::testFiles_data()
 void TestPerfData::testFiles()
 {
     QFETCH(QString, dirName);
-    if (dirName == "vector_static_clang")
-        QSKIP("vector_static_clang is broken");
 
     const auto dir = QFINDTESTDATA(dirName);
     QVERIFY(!dir.isEmpty() && QFile::exists(dir));
@@ -245,6 +243,11 @@ void TestPerfData::testFiles()
         PerfParserTestClient client;
         client.extractTrace(&output);
         client.convertToText(stream);
+        stream.flush();
+
+        // some older platforms produce strange type names for complex doubles...
+        // use the new form as the canonical form
+        actualText.replace("doublecomplex ", "double _Complex");
 
         QFile actual(actualOutputFile);
         QVERIFY(actual.open(QIODevice::WriteOnly | QIODevice::Text));
diff --git a/tests/auto/perfdata/vector_static_clang/expected.txt b/tests/auto/perfdata/vector_static_clang/expected.txt
index 6a25000..25fda49 100644
--- a/tests/auto/perfdata/vector_static_clang/expected.txt
+++ b/tests/auto/perfdata/vector_static_clang/expected.txt
@@ -236,7 +236,7 @@ vector_static_c	337401	337401	57697.314751138
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -258,7 +258,7 @@ vector_static_c	337401	337401	57697.314846047
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -350,7 +350,7 @@ vector_static_c	337401	337401	57697.315376058
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -438,7 +438,7 @@ vector_static_c	337401	337401	57697.316229231
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -553,7 +553,7 @@ vector_static_c	337401	337401	57697.317627942
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -747,7 +747,7 @@ vector_static_c	337401	337401	57697.319587384
 	41848e
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -805,7 +805,7 @@ vector_static_c	337401	337401	57697.320327591
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -845,7 +845,7 @@ vector_static_c	337401	337401	57697.320829914
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -867,7 +867,7 @@ vector_static_c	337401	337401	57697.321077509
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -905,7 +905,7 @@ vector_static_c	337401	337401	57697.321468353
 	4184c1
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -927,7 +927,7 @@ vector_static_c	337401	337401	57697.321597300
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -1207,7 +1207,7 @@ vector_static_c	337401	337401	57697.324274941
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1
@@ -1265,7 +1265,7 @@ vector_static_c	337401	337401	57697.324982654
 	418497
 	418480	__hypot vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	402670	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:50
-	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(doublecomplex ) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
+	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:611:0	std::__complex_abs(double _Complex) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:-1
 	40266c	/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/9.1.0/../../../../include/c++/9.1.0/complex:619:0	double std::abs<double>(std::complex<double> const&) vector_static_clang_v8.0.1 /tmp/vector_static_clang_v8.0.1 
 	40266c	./vector.cpp:15:-1