Fix up evoral test suite.
git-svn-id: svn://localhost/ardour2/branches/3.0@7483 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c685724c80
commit
963bc50a8b
@ -1,24 +1,24 @@
|
||||
#!/bin/sh
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../build/default/libs/evoral
|
||||
srcdir=`pwd`
|
||||
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srcdir/../../build/default/libs/evoral:$srcdir/../../build/default/libs/pbd
|
||||
if [ ! -f './test/testdata/TakeFive.mid' ]; then
|
||||
echo "This script must be run from within the libs/evoral directory";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
srcdir=`pwd`
|
||||
|
||||
# Make symlink to TakeFive.mid in build directory
|
||||
cd ../../build/default/libs/evoral
|
||||
mkdir -p ./test/testdata
|
||||
ln -fs $srcdir/test/testdata/TakeFive.mid \
|
||||
./test/testdata/TakeFive.mid
|
||||
|
||||
lcov -d ./src -z
|
||||
lcov -q -d ./src -z
|
||||
./run-tests
|
||||
lcov -d ./src -d ./test -b ../../.. -c > coverage.lcov
|
||||
lcov -r coverage.lcov *boost* *c++* *usr/include* -o coverage.lcov
|
||||
lcov -q -d ./src -d ./test -b ../../.. -c > coverage.lcov
|
||||
lcov -q -r coverage.lcov *boost* *c++* *usr/include* -o coverage.lcov
|
||||
mkdir -p ./coverage
|
||||
genhtml -o coverage coverage.lcov
|
||||
genhtml -q -o coverage coverage.lcov
|
||||
#rm -r coverage/boost
|
||||
#rm -r coverage/usr
|
||||
#rm -r coverage/c++
|
||||
|
@ -42,7 +42,7 @@ SMFTest::takeFiveTest ()
|
||||
// make ev.time absolute time in frames
|
||||
ev.time() = time * frames_per_beat / (double)smf.ppqn();
|
||||
ev.set_event_type(type_map->midi_event_type(buf[0]));
|
||||
seq->append(ev);
|
||||
seq->append(ev, next_event_id ());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,8 @@ public:
|
||||
}
|
||||
|
||||
int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const {
|
||||
return SMF::read_event(delta_t, size, buf);
|
||||
event_id_t id;
|
||||
return SMF::read_event(delta_t, size, buf, &id);
|
||||
}
|
||||
|
||||
private:
|
||||
|
@ -29,21 +29,21 @@ SequenceTest::preserveEventOrderingTest ()
|
||||
);
|
||||
|
||||
event->buffer()[0] = MIDI_CMD_CONTROL;
|
||||
event->buffer()[1] = event->time() / 100;
|
||||
event->buffer()[2] = event->time() / 100;
|
||||
event->buffer()[1] = event->time() / 1000;
|
||||
event->buffer()[2] = event->time() / 1000;
|
||||
|
||||
boost::shared_ptr<Event<Time> > event_ptr(event);
|
||||
|
||||
seq->append((*i)->on_event());
|
||||
seq->append((*i)->on_event(), next_event_id ());
|
||||
inserted_events.push_back(
|
||||
boost::shared_ptr<Event<Time> >(
|
||||
new Event<Time>((*i)->on_event(), true)
|
||||
));
|
||||
|
||||
seq->append(*event_ptr);
|
||||
seq->append(*event_ptr, next_event_id ());
|
||||
inserted_events.push_back(event_ptr);
|
||||
|
||||
seq->append((*i)->off_event());
|
||||
seq->append((*i)->off_event(), next_event_id ());
|
||||
inserted_events.push_back(
|
||||
boost::shared_ptr<Event<Time> >(
|
||||
new Event<Time>((*i)->off_event(), true)
|
||||
|
@ -106,7 +106,7 @@ def build(bld):
|
||||
obj.name = 'libevoral_static'
|
||||
obj.target = 'evoral_static'
|
||||
obj.uselib = 'GLIBMM GTHREAD SMF'
|
||||
obj.uselib_local = 'libsmf'
|
||||
obj.uselib_local = 'libsmf libpbd'
|
||||
obj.vnum = EVORAL_LIB_VERSION
|
||||
obj.install_path = ''
|
||||
obj.ccflags = [ '-fprofile-arcs', '-ftest-coverage' ]
|
||||
@ -121,7 +121,7 @@ def build(bld):
|
||||
'''
|
||||
obj.includes = ['.', './src']
|
||||
obj.uselib_local = 'libevoral_static'
|
||||
obj.uselib = 'CPPUNIT'
|
||||
obj.uselib = 'CPPUNIT SNDFILE'
|
||||
obj.libs = 'gcov'
|
||||
obj.target = 'run-tests'
|
||||
obj.install_path = ''
|
||||
|
@ -38,7 +38,7 @@ ScalarPropertiesTest::testBasic ()
|
||||
|
||||
PropertyList undo;
|
||||
PropertyList redo;
|
||||
_fred.diff (undo, redo);
|
||||
_fred.diff (undo, redo, 0);
|
||||
|
||||
CPPUNIT_ASSERT (undo.size() == 1);
|
||||
CPPUNIT_ASSERT (redo.size() == 1);
|
||||
|
@ -122,7 +122,7 @@ def build(bld):
|
||||
'''.split()
|
||||
testobj.target = 'run-tests'
|
||||
testobj.includes = obj.includes + ['test', '../pbd']
|
||||
testobj.uselib = 'CPPUNIT XML'
|
||||
testobj.uselib = 'CPPUNIT XML SNDFILE'
|
||||
testobj.uselib_local = 'libpbd'
|
||||
|
||||
def shutdown():
|
||||
|
Loading…
Reference in New Issue
Block a user