Changeset 01a95e76381eebe5a99a6feefc6a9cfff770962e

Show
Ignore:
Timestamp:
04/11/08 18:47:05 (4 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1207932425 +0200
git-parent:

[04e7bd8471c3470615f8a42fbe9d51aa857b1073]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1207734335 +0200
Message:

test: Move testapi.c to /test and use a sample file that is not ogg for basic testing.

This sample is downloaded from streams.videolan.org. Feel free to find a better suited codec/demux combination.
libvlc test are now splitted a bit.
Tests that are specific to core and that don't need vlc's modules are kept in src/test.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r647a7ad r01a95e7  
    99#  - libs/* are needed by modules 
    1010SUBDIRS = po libs/loader libs/srtp src modules \ 
    11         projects/mozilla bindings projects/activex share doc 
     11        projects/mozilla bindings projects/activex share doc test 
    1212DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg 
    1313 

  • configure.ac

    r647a7ad r01a95e7  
    62276227  share/Makefile 
    62286228  src/Makefile 
     6229  test/Makefile 
    62296230]) 
    62306231 

  • extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt

    r500894f r01a95e7  
    3434add_subdirectory(modules) 
    3535add_subdirectory(po) 
     36add_subdirectory(test) 
    3637 
    3738# Enable uninstall 

  • extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt

    r3e0c520 r01a95e7  
    271271# Tests 
    272272 
    273 add_executable(test_testapi    control/testapi.c) 
    274273add_executable(test_i18n_atof  test/i18n_atof.c) 
    275274add_executable(test_url        test/url.c) 
    …… 
    277276add_executable(test_dictionary test/dictionary.c) 
    278277 
    279 target_link_libraries(test_testapi    libvlc-control) 
    280278target_link_libraries(test_i18n_atof  libvlc) 
    281279target_link_libraries(test_url        libvlc) 
    …… 
    283281target_link_libraries(test_dictionary libvlc) 
    284282 
    285 add_test(test_control    ${CMAKE_CURRENT_BINARY_DIR}/test_testapi) 
    286283add_test(test_i18n_atof  ${CMAKE_CURRENT_BINARY_DIR}/test_i18n_atof) 
    287284add_test(test_url        ${CMAKE_CURRENT_BINARY_DIR}/test_url) 

  • extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh

    r500894f r01a95e7  
    2222rm -f modules/gui/qt4/CMakeLists.txt 
    2323 
    24 echo "Installing libs/loaders/CMakeLists.txt" 
    25 rm -f libs/loaders/CMakeLists.txt 
    26 ln -s ../$cmake_dir/CMakeLists/libs_loaders_CMakeLists.txt libs/loaders/CMakeLists.txt 
     24echo "Installing libs/loader/CMakeLists.txt" 
     25rm -f libs/loader/CMakeLists.txt 
     26ln -s ../../$cmake_dir/CMakeLists/libs_loaders_CMakeLists.txt libs/loader/CMakeLists.txt 
    2727 
    2828echo "Installing modules/CMakeLists.txt" 
    …… 
    3434ln -s ../$cmake_dir/CMakeLists/po_CMakeLists.txt po/CMakeLists.txt 
    3535 
    36 echo "Installing include/config.h.cmake" 
     36echo "installing test/CMakeLists.txt" 
     37rm -f test/CMakeLists.txt 
     38ln -sf ../$cmake_dir/CMakeLists/test_CMakeLists.txt test/CMakeLists.txt 
     39 
     40echo "installing include/config.h.cmake" 
    3741rm -f include/config.h.cmake 
    3842ln -sf ../$cmake_dir/config.h.cmake include/config.h.cmake 

  • src/Makefile.am

    rbfd22dd r01a95e7  
    443443    test_utf8 \ 
    444444    test_headers \ 
    445     test_control \ 
    446445    $(NULL) 
    447446 
    …… 
    469468test_headers_SOURCES = test/headers.c 
    470469test_headers_CFLAGS = $(CFLAGS_tests) 
    471  
    472 test_control_SOURCES = control/testapi.c 
    473 test_control_LDADD = libvlc-control.la 
    474 test_control_CFLAGS = $(CFLAGS_tests) 
    475470 
    476471check-local: