From b5f1a55c3112f46f27e2306fac7d93bde96152e6 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 21 May 2010 13:21:44 +0200
Subject: tst_bic: make it possible to test for cross-compilation

---
 tests/auto/bic/gen.sh      |  2 +-
 tests/auto/bic/tst_bic.cpp | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 8005880..7bcad24 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -56,7 +56,7 @@ fi
 
 for module in $modules; do
     echo "#include <$module/$module>" >test.cpp
-    g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
+    ${CXX-g++} $CXXFLAGS -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
     mv test.cpp*.class $module.$2.txt
     # Remove template classes from the output
     perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</);
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 400fcc1..504512d 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -178,13 +178,17 @@ void tst_Bic::sizesAndVTables_data()
     QSKIP("Test not implemented for this compiler/platform", SkipAll);
 #else
 
-#if defined Q_OS_LINUX && defined Q_WS_X11
+#if defined(FILESUFFIX)
+    // cross-testing
+#elif defined Q_OS_LINUX && defined Q_WS_X11
 # if defined(__powerpc__) && !defined(__powerpc64__)
 #  define FILESUFFIX "linux-gcc-ppc32"
 # elif defined(__amd64__)
 #  define FILESUFFIX "linux-gcc-amd64"
 # elif defined(__i386__)
 #  define FILESUFFIX "linux-gcc-ia32"
+# elif defined(__ARMEL__)
+#  define FILESUFFIX "linux-gcc-armel"
 # endif
 #elif defined Q_OS_MAC && defined(__powerpc__)
 #  define FILESUFFIX "macx-gcc-ppc32"
@@ -233,9 +237,11 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
 #ifdef Q_OS_WIN
     qtDir.replace('\\', '/');
 #endif
-    QString compilerName = "g++";
+    QString compilerName = QString::fromLocal8Bit(qgetenv("CXX"));
+    if (compilerName.isEmpty())
+        compilerName = "g++";
 
-    QStringList args;
+    QStringList args = QString::fromLocal8Bit(qgetenv("CXXFLAGS")).split(' ');
     args << "-c"
          << "-I" + qtDir + "/include"
 #ifdef Q_OS_MAC
-- 
cgit v0.12