diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-04-19 16:48:56 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-04-19 16:48:56 +0200 |
| commit | 8abab6618860f9d8688a4653de258c8673bfc662 (patch) | |
| tree | abf0b6fe966c535ebdb33eb21ee87d99e6678877 /test | |
| parent | b7b8f2fe74b02780774c51f740519469982231a1 (diff) | |
| parent | 42e3c64fa57039d7673c61f909b5fd40a437bdfd (diff) | |
| download | uca-8abab6618860f9d8688a4653de258c8673bfc662.tar.gz uca-8abab6618860f9d8688a4653de258c8673bfc662.tar.bz2 uca-8abab6618860f9d8688a4653de258c8673bfc662.tar.xz uca-8abab6618860f9d8688a4653de258c8673bfc662.zip | |
Merge branch 'rewrite-props'
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | test/test-all.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7d438b6..7380179 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,12 +43,14 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/cameras ) -add_executable(test-mock test-mock.c) -target_link_libraries(test-mock - uca-gobject - ${GLIB2_LIBRARIES} - ${GOBJECT2_LIBRARIES} - ) +if (HAVE_MOCK_CAMERA) + add_executable(test-mock test-mock.c) + target_link_libraries(test-mock + uca-gobject + ${GLIB2_LIBRARIES} + ${GOBJECT2_LIBRARIES} + ) +endif() add_executable(test-all test-all.c) target_link_libraries(test-all diff --git a/test/test-all.c b/test/test-all.c index 941c0cd..37af97d 100644 --- a/test/test-all.c +++ b/test/test-all.c @@ -75,7 +75,7 @@ static void test_recording_async(Fixture *fixture, gconstpointer data) gfloat max_frame_rate = 1.0f; g_object_get(G_OBJECT(camera), - "max-frame-rate", &max_frame_rate, + "sensor-max-frame-rate", &max_frame_rate, NULL); g_assert(max_frame_rate != 0.0f); |