-Updated Tup again
parent
91419b60f3
commit
f55707035c
3
Tupfile
3
Tupfile
|
@ -10,4 +10,5 @@ LDFLAGS +=-lgcov
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# LINK
|
# LINK
|
||||||
: src/*.o src/avtk/*.o src/cjson/*.o src/controller/*.o src/dsp/*.o src/observer/*.o src/state/*.o src/tests/*.o |> ^c^ g++ %f $(LDFLAGS) -o %o |> luppp
|
: src/*.o src/avtk/*.o src/cjson/*.o src/controller/*.o src/dsp/*.o src/observer/*.o src/state/*.o src/tests/*.o \
|
||||||
|
|> g++ %f $(LDFLAGS) -o %o && touch build.success |> luppp | build.success
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
|
|
||||||
# no build flags for release mode
|
# no build flags for release mode
|
||||||
CONFIG_LUPPP_BUILD_TESTS=n
|
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# sometimes Tup gives errors on FUSE mount or something
|
||||||
|
# just deleting .tup/mnt/* makes tup re-mount things, fixing it:
|
||||||
|
|
||||||
|
rm -rf .tup/mnt/*
|
||||||
|
rm -rf build/src/*
|
||||||
|
rm -rf buildTest/src/*
|
6
run.sh
6
run.sh
|
@ -2,8 +2,4 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
tup upd
|
tup upd
|
||||||
<<<<<<< HEAD
|
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & build/luppp
|
||||||
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & releaseBuild/luppp
|
|
||||||
=======
|
|
||||||
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & ./releaseBuild/luppp
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
|
@ -13,4 +13,4 @@ CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DD
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# COMPILE
|
# COMPILE
|
||||||
: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
||||||
|
|
|
@ -13,4 +13,4 @@ CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DD
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# COMPILE
|
# COMPILE
|
||||||
: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
||||||
|
|
|
@ -13,4 +13,4 @@ CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DD
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# COMPILE
|
# COMPILE
|
||||||
: foreach *.c |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
: foreach *.c |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> $(OUTPUT)
|
||||||
|
|
|
@ -302,6 +302,7 @@ void LooperClip::queuePlay(bool qP)
|
||||||
|
|
||||||
void LooperClip::queueStop()
|
void LooperClip::queueStop()
|
||||||
{
|
{
|
||||||
|
// comment
|
||||||
_queueStop = true;
|
_queueStop = true;
|
||||||
_queuePlay = false;
|
_queuePlay = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,6 @@ int main(int argc, char** argv)
|
||||||
#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
|
||||||
cout << "Done testing... launching Luppp." << endl;
|
|
||||||
jack->activate();
|
jack->activate();
|
||||||
gui->show();
|
gui->show();
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,4 +6,4 @@ CFLAGS += -g -Wall -march=native -msse -mfpmath=sse -ffast-math
|
||||||
INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
|
INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
|
||||||
|
|
||||||
# COMPILE
|
# COMPILE
|
||||||
: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o
|
: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o
|
||||||
|
|
|
@ -9,5 +9,5 @@ INCLUDES += `pkg-config --cflags jack sndfile cairomm-1.0 ntk ntk_images`
|
||||||
# CONFIGURE
|
# CONFIGURE
|
||||||
ifeq (@(LUPPP_BUILD_TESTS),y)
|
ifeq (@(LUPPP_BUILD_TESTS),y)
|
||||||
CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR
|
CFLAGS += -fprofile-arcs -ftest-coverage -DBUILD_TESTS -DBUILD_COVERAGE_TEST -DDEBUG_KILL_ON_ERR
|
||||||
: foreach *.cxx |> ^c^ g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o | %B.gcno
|
: foreach *.cxx |> g++ $(CFLAGS) -c %f $(INCLUDES) -o %o |> %B.o | %B.gcno
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -29,7 +29,8 @@ 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 CHECKS
|
/*
|
||||||
|
/// PAD STATE CHECKSfds
|
||||||
// empty -> recording
|
// empty -> recording
|
||||||
lc->init();
|
lc->init();
|
||||||
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_EMPTY );
|
QUNIT_IS_TRUE( lc->getState() == GridLogic::STATE_EMPTY );
|
||||||
|
@ -56,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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,6 @@ namespace QUnit {
|
||||||
cout << QUNIT_COLOUR_ERROR;
|
cout << QUNIT_COLOUR_ERROR;
|
||||||
}
|
}
|
||||||
cout << ( ok ? "OK" : "FAILED" ) << QUNIT_COLOUR_RESET << "/" << func << "(): ";
|
cout << ( ok ? "OK" : "FAILED" ) << QUNIT_COLOUR_RESET << "/" << func << "(): ";
|
||||||
//cout << QUNIT_COLOUR_RESET;
|
|
||||||
if( compare ) {
|
if( compare ) {
|
||||||
const std::string cmp = ( result ? "==" : "!=" );
|
const std::string cmp = ( result ? "==" : "!=" );
|
||||||
cout << "compare {" << str1 << "} " << cmp << " {" << str2 << "} "
|
cout << "compare {" << str1 << "} " << cmp << " {" << str2 << "} "
|
||||||
|
|
31
test.sh
31
test.sh
|
@ -13,19 +13,30 @@
|
||||||
# lcov scrapes .gcov files into lcov.info
|
# lcov scrapes .gcov files into lcov.info
|
||||||
# genhtml produces index.html from lcov.info
|
# genhtml produces index.html from lcov.info
|
||||||
|
|
||||||
set -e
|
#set -e
|
||||||
|
|
||||||
rm -rf buildTest/src/
|
|
||||||
|
|
||||||
tup upd buildTest/
|
FILE=buildTest/build.success
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
notify-send -t 5 "Luppp: Compiled successfully..."
|
rm -f $(FILE)
|
||||||
echo OK
|
|
||||||
else
|
tup upd buildTest/ ;
|
||||||
notify-send -t 0 --urgency=critical "Luppp: Compilation FAILURE!"
|
|
||||||
echo FAIL
|
|
||||||
|
if [ ! -f $FILE ]; then
|
||||||
|
echo "File not found!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -f $FILE ];
|
||||||
|
then
|
||||||
|
echo "File $FILE exists."
|
||||||
|
else
|
||||||
|
notify-send -t 0 --urgency=critical "Luppp: Compilation FAILURE!"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
cd buildTest/
|
cd buildTest/
|
||||||
|
|
||||||
./luppp
|
./luppp
|
||||||
|
@ -46,4 +57,4 @@ lcov --directory . --capture --output-file lcov.info
|
||||||
genhtml lcov.info
|
genhtml lcov.info
|
||||||
|
|
||||||
notify-send -t 5 "Luppp: Test data available..."
|
notify-send -t 5 "Luppp: Test data available..."
|
||||||
firefox src/index.html
|
#firefox src/index.html
|
||||||
|
|
Loading…
Reference in New Issue