diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 10:03:00 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 10:03:39 +0200 |
| commit | 7c33aef69f59f92c9efbe43368aba33d6391be0c (patch) | |
| tree | b04f5b6861a9cc3b80e8e4819c0feba4d9bae7c3 /tests | |
| parent | 4add74753e868e2882bd8a571edb54a8966617fa (diff) | |
Revert "tst_bic: make it possible to test for cross-compilation"
This reverts commit b5f1a55c3112f46f27e2306fac7d93bde96152e6.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/auto/bic/gen.sh | 2 | ||||
| -rw-r--r-- | tests/auto/bic/tst_bic.cpp | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh index 7bcad24000..8005880317 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 - ${CXX-g++} $CXXFLAGS -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp + g++ -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 504512d683..400fcc11e3 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -178,17 +178,13 @@ void tst_Bic::sizesAndVTables_data() QSKIP("Test not implemented for this compiler/platform", SkipAll); #else -#if defined(FILESUFFIX) - // cross-testing -#elif defined Q_OS_LINUX && defined Q_WS_X11 +#if 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" @@ -237,11 +233,9 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName) #ifdef Q_OS_WIN qtDir.replace('\\', '/'); #endif - QString compilerName = QString::fromLocal8Bit(qgetenv("CXX")); - if (compilerName.isEmpty()) - compilerName = "g++"; + QString compilerName = "g++"; - QStringList args = QString::fromLocal8Bit(qgetenv("CXXFLAGS")).split(' '); + QStringList args; args << "-c" << "-I" + qtDir + "/include" #ifdef Q_OS_MAC |