Merge topic 'RemoveNonworkingKDE4Test'
11f23fe
remove non-working KDE4 test
This commit is contained in:
commit
407ccb4957
|
@ -70,11 +70,6 @@ if(BUILD_TESTING)
|
|||
"Should the tests that run a full sub ctest process be run?"
|
||||
OFF)
|
||||
mark_as_advanced(CTEST_TEST_CTEST)
|
||||
|
||||
option(TEST_KDE4_STABLE_BRANCH
|
||||
"Should the KDE4 stable branch test be run?"
|
||||
OFF)
|
||||
mark_as_advanced(TEST_KDE4_STABLE_BRANCH)
|
||||
endif ()
|
||||
|
||||
# Should tests that use CVS be run?
|
||||
|
@ -2112,43 +2107,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
|||
endif ()
|
||||
endif ()
|
||||
|
||||
if (CMAKE_RUN_LONG_TESTS AND TEST_KDE4_STABLE_BRANCH)
|
||||
if(UNIX)
|
||||
if(NOT QT4_FOUND)
|
||||
find_package(Qt4)
|
||||
endif()
|
||||
|
||||
set(TRY_BUILD_KDE4 TRUE)
|
||||
if(QT4_FOUND)
|
||||
# check whether it's Qt 4.5 in a cmake 2.4. compatible way:
|
||||
if(NOT EXISTS "${QT_QTNETWORK_INCLUDE_DIR}/QAbstractNetworkCache")
|
||||
set(TRY_BUILD_KDE4 FALSE)
|
||||
endif()
|
||||
else()
|
||||
set(TRY_BUILD_KDE4 FALSE)
|
||||
endif()
|
||||
|
||||
find_package(Perl)
|
||||
if(NOT PERL_FOUND)
|
||||
set(TRY_BUILD_KDE4 FALSE)
|
||||
endif()
|
||||
|
||||
find_package(ZLIB)
|
||||
if(NOT ZLIB_FOUND)
|
||||
set(TRY_BUILD_KDE4 FALSE)
|
||||
endif()
|
||||
|
||||
if(TRY_BUILD_KDE4)
|
||||
file(MAKE_DIRECTORY ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest)
|
||||
set(TEST_KDE4_BASE_DIR ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest)
|
||||
configure_file(${CMake_SOURCE_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh.in ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh @ONLY)
|
||||
execute_process(COMMAND chmod 755 ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh )
|
||||
add_test(KDE4StableBranchTest ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh)
|
||||
endif()
|
||||
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
if("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)
|
||||
set(CMAKE_SKIP_BOOTSTRAP_TEST 1)
|
||||
endif()
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# This shell script tests whether cmake is able to build the latest
|
||||
# stable KDE4 release, or at least some part of it.
|
||||
# It downloads automoc from KDE svn, builds and installs it, then it
|
||||
# downloads phonon from KDE svn, builds and installs it, and finally
|
||||
# it downloads kdelibs (currently from the 4.3 branch), and builds
|
||||
# a (small) part of it, i.e. libkdecore and one unit test depending on it.
|
||||
#
|
||||
# <neundorf AT kde.org>
|
||||
|
||||
CMAKE="@CMAKE_CMAKE_COMMAND@"
|
||||
BASEDIR="@TEST_KDE4_BASE_DIR@"
|
||||
INSTALLDIR="$BASEDIR/install"
|
||||
QMAKE="@QT_QMAKE_EXECUTABLE@"
|
||||
|
||||
cd "$BASEDIR" || exit -1
|
||||
echo "Removing old install dir " $INSTALLDIR
|
||||
|
||||
rm -rf install || exit -1
|
||||
rm -rf build-automoc || exit -1
|
||||
rm -rf build-phonon || exit -1
|
||||
rm -rf build-kdelibs || exit -1
|
||||
|
||||
|
||||
|
||||
# build and install automoc
|
||||
cd "$BASEDIR" || exit -1
|
||||
svn co svn://anonsvn.kde.org/home/kde/tags/kdesupport-for-4.3/kdesupport/automoc || exit -1
|
||||
|
||||
mkdir -p build-automoc || exit -1
|
||||
|
||||
cd build-automoc || exit -1
|
||||
"$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DQT_QMAKE_EXECUTABLE:STRING="$QMAKE" ../automoc || exit -1
|
||||
"$CMAKE" --build . || exit -1
|
||||
"$CMAKE" -P cmake_install.cmake || exit -1
|
||||
|
||||
export CMAKE_PREFIX_PATH="$INSTALLDIR:$CMAKE_PREFIX_PATH"
|
||||
|
||||
|
||||
# build and install phonon
|
||||
cd "$BASEDIR" || exit -1
|
||||
svn co svn://anonsvn.kde.org/home/kde/tags/kdesupport-for-4.3/kdesupport/phonon || exit -1
|
||||
|
||||
mkdir -p build-phonon || exit -1
|
||||
|
||||
cd build-phonon || exit -1
|
||||
"$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DQT_QMAKE_EXECUTABLE:STRING="$QMAKE" -DWITH_GLIB2=FALSE -DWITH_GObject=FALSE -DWITH_GStreamer=FALSE -DWITH_GStreamerPlugins=FALSE -DWITH_OpenGL=FALSE -DWITH_XCB=FALSE -DWITH_Xine=FALSE ../phonon || exit -1
|
||||
"$CMAKE" --build . || exit -1
|
||||
"$CMAKE" -P cmake_install.cmake || exit -1
|
||||
|
||||
|
||||
# finally build kdelibs/kdecore
|
||||
cd "$BASEDIR" || exit -1
|
||||
|
||||
svn co svn://anonsvn.kde.org/home/kde/branches/KDE/4.3/kdelibs/ || exit -1
|
||||
mkdir -p build-kdelibs || exit -1
|
||||
cd build-kdelibs || exit -1
|
||||
# trick cmake into not searching strigi and not searching sharedmimeinfo
|
||||
"$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DQT_QMAKE_EXECUTABLE:STRING="$QMAKE" -DSTRIGI_FOUND=TRUE -DSTRIGI_INCLUDE_DIR=/usr/include -DSTRIGI_STREAMANALYZER_LIBRARY=-lc -DSTRIGI_STREAMS_LIBRARY=-lc -DSTRIGI_STRIGIQTDBUSCLIENT_LIBRARY=-lc -DSTRIGI_NEEDS_SIGNED_CHAR=TRUE -DSTRIGI_NEEDS_CHAR=FALSE -DUPDATE_MIME_DATABASE_EXECUTABLE=/bin/sh ../kdelibs || exit -1
|
||||
make -C kdecore/tests kurltest || exit -1
|
||||
|
Loading…
Reference in New Issue