[Amarok] 9a9bdba: test: do not install data files

Maximilian Kossick maximilian.kossick at googlemail.com
Wed Jun 23 09:07:04 CEST 2010


I can't check right now, but does this mean that all of the original
unit tests have been moved out of amarokapp? And do they work? Has the
--test (or whatever it was) flag been removed from Amarok?



On Wed, Jun 23, 2010 at 8:46 AM, Rick W.Chen <stuffcorpse at archlinux.us> wrote:
> commit 9a9bdbae9e8c6eaf916efdd113130deb1f7e86b4
> Author: Rick W. Chen <stuffcorpse at archlinux.us>
> Date:   Mon May 10 00:33:07 2010 +1200
>
>    test: do not install data files
>
>    There's no need to install them since the tests should find the data they
>    need under the source tree.
>
>    See tests/config-amarok-test.h.cmake
>
> diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
> index bf6f8d6..e3c8791 100644
> --- a/tests/CMakeLists.txt
> +++ b/tests/CMakeLists.txt
> @@ -17,7 +17,6 @@ include_directories( .
>  )
>
>  add_subdirectory( amarokurls )
> -add_subdirectory( data )
>  add_subdirectory( context )
>  add_subdirectory( core )
>  add_subdirectory( core-impl )
> diff --git a/tests/data/CMakeLists.txt b/tests/data/CMakeLists.txt
> deleted file mode 100644
> index 5ab6a61..0000000
> --- a/tests/data/CMakeLists.txt
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -add_subdirectory( audio )
> -add_subdirectory( cue )
> -add_subdirectory( playlists )
> diff --git a/tests/data/audio/CMakeLists.txt b/tests/data/audio/CMakeLists.txt
> deleted file mode 100644
> index cc517bc..0000000
> --- a/tests/data/audio/CMakeLists.txt
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -if(KDE4_BUILD_TESTS)
> -install(
> -        FILES
> -        Platz\ 01.mp3
> -        Platz\ 02.mp3
> -        Platz\ 03.mp3
> -        Platz\ 04.mp3
> -        Platz\ 05.mp3
> -        Platz\ 06.mp3
> -        Platz\ 07.mp3
> -        Platz\ 08.mp3
> -        Platz\ 09.mp3
> -        Platz\ 10.mp3
> -        DESTINATION ${DATA_INSTALL_DIR}/amarok/testdata/audio
> -)
> -add_subdirectory( album )
> -
> -endif()
> -
> diff --git a/tests/data/audio/album/CMakeLists.txt b/tests/data/audio/album/CMakeLists.txt
> deleted file mode 100644
> index 114fff1..0000000
> --- a/tests/data/audio/album/CMakeLists.txt
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -install(
> -        FILES
> -        Track01.ogg
> -        Track02.ogg
> -        Track03.ogg
> -        DESTINATION ${DATA_INSTALL_DIR}/amarok/testdata/album
> -)
> diff --git a/tests/data/cue/CMakeLists.txt b/tests/data/cue/CMakeLists.txt
> deleted file mode 100644
> index f6bf208..0000000
> --- a/tests/data/cue/CMakeLists.txt
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -if(KDE4_BUILD_TESTS)
> -install(
> -        FILES
> -        testsheet01-iso8859-1.cue
> -        testsheet01-utf8.cue
> -        invalid.cue
> -        test_silence.ogg
> -        DESTINATION ${DATA_INSTALL_DIR}/amarok/testdata/cue
> -)
> -endif()
> diff --git a/tests/data/playlists/CMakeLists.txt b/tests/data/playlists/CMakeLists.txt
> deleted file mode 100644
> index 3b8d415..0000000
> --- a/tests/data/playlists/CMakeLists.txt
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -if(KDE4_BUILD_TESTS)
> -install(
> -        FILES
> -        no-playlist.png
> -        test.asx
> -        test.m3u
> -        test.pls
> -        test.ram
> -        test.smil
> -        test.xspf
> -        DESTINATION ${DATA_INSTALL_DIR}/amarok/testdata/playlists
> -)
> -endif()
>


More information about the Amarok-devel mailing list