diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2012-07-27 13:38:50 +0200 |
|---|---|---|
| committer | Marcin Kościelnicki <koriakin@0x04.net> | 2012-07-27 13:38:50 +0200 |
| commit | b9d397cd52977721c22981b34fb57cb6e696a809 (patch) | |
| tree | 17d60affd905f8b6dae56a3e8cda3bcc55b01201 /vstream | |
| parent | 955a14781b82921007b6fa94dcc0682fb4edbe20 (diff) | |
Use ctest for testing, fold existing vstream tests into it.
Diffstat (limited to 'vstream')
| -rw-r--r-- | vstream/.gitignore | 3 | ||||
| -rw-r--r-- | vstream/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | vstream/test/.gitignore | 3 | ||||
| -rw-r--r-- | vstream/test/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | vstream/test/predtest.c (renamed from vstream/predtest.c) | 0 | ||||
| -rw-r--r-- | vstream/test/test264.c (renamed from vstream/test264.c) | 0 | ||||
| -rw-r--r-- | vstream/test/vstest.c (renamed from vstream/vstest.c) | 0 |
7 files changed, 22 insertions, 12 deletions
diff --git a/vstream/.gitignore b/vstream/.gitignore index 762633b1..d9c2e664 100644 --- a/vstream/.gitignore +++ b/vstream/.gitignore @@ -1,7 +1,4 @@ -vstest -predtest deh261 deh262 deh264 -test264 libvstream.a diff --git a/vstream/CMakeLists.txt b/vstream/CMakeLists.txt index ca272e45..3432f1b2 100644 --- a/vstream/CMakeLists.txt +++ b/vstream/CMakeLists.txt @@ -5,8 +5,6 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces") include_directories(../include) -include_directories(${PC_PCIACCESS_INCLUDE_DIRS} ${PC_X11_INCLUDE_DIRS} ${PC_VDPAU_INCLUDE_DIRS} ../include) - add_library(vstream bitstream.c h264.c h264_slice.c h264_residual.c h264_print.c h264_cabac.c h264_cavlc.c h264_se.c @@ -14,21 +12,17 @@ add_library(vstream bitstream.c h261.c ) -add_executable(vstest vstest.c) -add_executable(predtest predtest.c) add_executable(deh261 deh261.c) add_executable(deh262 deh262.c) add_executable(deh264 deh264.c) -add_executable(test264 test264.c) -target_link_libraries(vstest vstream) -target_link_libraries(predtest vstream) target_link_libraries(deh261 vstream) target_link_libraries(deh262 vstream) target_link_libraries(deh264 vstream) -target_link_libraries(test264 vstream) -install(TARGETS vstream deh261 deh262 deh264 test264 +install(TARGETS vstream deh261 deh262 deh264 RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) + +add_subdirectory(test) diff --git a/vstream/test/.gitignore b/vstream/test/.gitignore new file mode 100644 index 00000000..03254d04 --- /dev/null +++ b/vstream/test/.gitignore @@ -0,0 +1,3 @@ +vstest +predtest +test264 diff --git a/vstream/test/CMakeLists.txt b/vstream/test/CMakeLists.txt new file mode 100644 index 00000000..df5994d5 --- /dev/null +++ b/vstream/test/CMakeLists.txt @@ -0,0 +1,16 @@ +project(ENVYTOOLS C) +cmake_minimum_required(VERSION 2.6) + +include_directories(../../include) + +add_executable(vstest vstest.c) +add_executable(predtest predtest.c) +add_executable(test264 test264.c) + +target_link_libraries(vstest vstream) +target_link_libraries(predtest vstream) +target_link_libraries(test264 vstream) + +add_test(vstest ${CMAKE_CURRENT_BINARY_DIR}/vstest) +add_test(predtest ${CMAKE_CURRENT_BINARY_DIR}/predtest) +add_test(test264 ${CMAKE_CURRENT_BINARY_DIR}/test264) diff --git a/vstream/predtest.c b/vstream/test/predtest.c index e409e4d0..e409e4d0 100644 --- a/vstream/predtest.c +++ b/vstream/test/predtest.c diff --git a/vstream/test264.c b/vstream/test/test264.c index e4f4810b..e4f4810b 100644 --- a/vstream/test264.c +++ b/vstream/test/test264.c diff --git a/vstream/vstest.c b/vstream/test/vstest.c index c706c358..c706c358 100644 --- a/vstream/vstest.c +++ b/vstream/test/vstest.c |