-Updated run and test.sh, updated CMakeLists
parent
6325ca8289
commit
2dc9ed8c74
|
@ -6,10 +6,18 @@ project (LUPPP)
|
||||||
set (Tutorial_VERSION_MAJOR 1)
|
set (Tutorial_VERSION_MAJOR 1)
|
||||||
set (Tutorial_VERSION_MINOR 0)
|
set (Tutorial_VERSION_MINOR 0)
|
||||||
|
|
||||||
#set(CMAKE_VERBOSE_MAKEFILE on)
|
|
||||||
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
#option(BUILD_TESTS "Build test version" OFF)
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
|
||||||
|
add_definitions( -DBUILD_TESTS )
|
||||||
|
add_definitions( -DBUILD_COVERAGE_TEST )
|
||||||
|
|
||||||
|
|
||||||
|
set(CMAKE_VERBOSE_MAKEFILE on)
|
||||||
|
|
||||||
|
#set(CMAKE_FILES_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
add_subdirectory (src)
|
add_subdirectory (src)
|
||||||
|
|
3
run.sh
3
run.sh
|
@ -1,5 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
tup upd
|
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & bin/luppp
|
||||||
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & build/luppp
|
|
||||||
|
|
|
@ -18,8 +18,17 @@ pkg_check_modules(SNDFILE sndfile)
|
||||||
include_directories( ${SNDFILE_INCLUDE_DIRS} )
|
include_directories( ${SNDFILE_INCLUDE_DIRS} )
|
||||||
link_directories ( ${SNDFILE_LIBRARY_DIRS} )
|
link_directories ( ${SNDFILE_LIBRARY_DIRS} )
|
||||||
|
|
||||||
|
# Add flags
|
||||||
|
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb")
|
||||||
|
|
||||||
|
SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
|
||||||
|
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}" )
|
||||||
|
|
||||||
|
#SET(GCC_COVERAGE_LINK_FLAGS "-lgcov")
|
||||||
|
#SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}" )
|
||||||
|
|
||||||
# Add files
|
# Add files
|
||||||
FILE(GLOB sources *.cxx avtk/*.cxx cjson/*.c controller/*.cxx dsp/*.cxx observer/*.cxx state/*.cxx)
|
FILE(GLOB sources *.cxx avtk/*.cxx cjson/*.c controller/*.cxx dsp/*.cxx observer/*.cxx state/*.cxx tests/*.cxx)
|
||||||
|
|
||||||
add_executable (luppp ${sources} )
|
add_executable (luppp ${sources} )
|
||||||
|
|
||||||
|
@ -28,3 +37,5 @@ target_link_libraries( luppp ${JACK_LIBRARIES} )
|
||||||
target_link_libraries( luppp ${NTK_LIBRARIES} )
|
target_link_libraries( luppp ${NTK_LIBRARIES} )
|
||||||
target_link_libraries( luppp ${CAIRO_LIBRARIES} )
|
target_link_libraries( luppp ${CAIRO_LIBRARIES} )
|
||||||
target_link_libraries( luppp ${SNDFILE_LIBRARIES} )
|
target_link_libraries( luppp ${SNDFILE_LIBRARIES} )
|
||||||
|
|
||||||
|
target_link_libraries( luppp gcov)
|
||||||
|
|
31
src/main.cxx
31
src/main.cxx
|
@ -24,6 +24,17 @@ Jack* jack = 0;
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
bool runTests = false;
|
||||||
|
bool stopAfterTest = false;
|
||||||
|
for(int i = 0; i < argc; i++)
|
||||||
|
{
|
||||||
|
if ( strcmp(argv[i], "-test" ) == 0 ) {
|
||||||
|
runTests = true;
|
||||||
|
} else if ( strcmp( argv[i], "-stopAfterTest") == 0 ) {
|
||||||
|
stopAfterTest = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// setup the environment
|
// setup the environment
|
||||||
AVOIDDENORMALS();
|
AVOIDDENORMALS();
|
||||||
|
|
||||||
|
@ -38,15 +49,21 @@ int main(int argc, char** argv)
|
||||||
jack = new Jack();
|
jack = new Jack();
|
||||||
|
|
||||||
#ifdef BUILD_TESTS
|
#ifdef BUILD_TESTS
|
||||||
// test offline functionality
|
if ( runTests )
|
||||||
gui->getDiskWriter()->runTests();
|
{
|
||||||
// test realtime functionality
|
// test offline functionality
|
||||||
jack->getGridLogic()->runTests();
|
gui->getDiskWriter()->runTests();
|
||||||
|
// test realtime functionality
|
||||||
|
jack->getGridLogic()->runTests();
|
||||||
|
|
||||||
#ifdef BUILD_COVERAGE_TEST
|
#ifdef BUILD_COVERAGE_TEST
|
||||||
LUPPP_NOTE("%s","Done testing, quitting!");
|
if ( stopAfterTest )
|
||||||
return 0;
|
{
|
||||||
|
LUPPP_NOTE("%s","Done testing, quitting!");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
// FIXME: Reset the state of GUI / GridLogic here. Create a "new session"?
|
// FIXME: Reset the state of GUI / GridLogic here. Create a "new session"?
|
||||||
#endif
|
#endif
|
||||||
jack->activate();
|
jack->activate();
|
||||||
|
|
|
@ -29,7 +29,7 @@ int GridLogic::runTests()
|
||||||
jack->getGridLogic()->launchScene( s );
|
jack->getGridLogic()->launchScene( s );
|
||||||
QUNIT_IS_TRUE( jack->getGridLogic()->getLaunchedScene() == s );
|
QUNIT_IS_TRUE( jack->getGridLogic()->getLaunchedScene() == s );
|
||||||
|
|
||||||
/*
|
|
||||||
/// PAD STATE CHECKSfds
|
/// PAD STATE CHECKSfds
|
||||||
// empty -> recording
|
// empty -> recording
|
||||||
lc->init();
|
lc->init();
|
||||||
|
@ -57,7 +57,7 @@ int GridLogic::runTests()
|
||||||
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_PLAY_QUEUED );
|
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_PLAY_QUEUED );
|
||||||
jack->getGridLogic()->bar();
|
jack->getGridLogic()->bar();
|
||||||
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_PLAYING );
|
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_PLAYING );
|
||||||
*/
|
|
||||||
|
|
||||||
return qunit.errors();
|
return qunit.errors();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue