From 963bc50a8b671f2c10f95c07aef37afd81f36445 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 25 Jul 2010 00:39:04 +0000 Subject: [PATCH] Fix up evoral test suite. git-svn-id: svn://localhost/ardour2/branches/3.0@7483 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/evoral/run-tests.sh | 14 +++++++------- libs/evoral/test/SMFTest.cpp | 2 +- libs/evoral/test/SMFTest.hpp | 3 ++- libs/evoral/test/SequenceTest.cpp | 10 +++++----- libs/evoral/wscript | 4 ++-- libs/pbd/test/scalar_properties.cc | 2 +- libs/pbd/wscript | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/libs/evoral/run-tests.sh b/libs/evoral/run-tests.sh index 64c36a8fec..eb6375a03b 100755 --- a/libs/evoral/run-tests.sh +++ b/libs/evoral/run-tests.sh @@ -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++ diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index 9bc6c639d9..2f306e9ebc 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -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 ()); } } diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp index 1dbceee6ab..9b5d2d54e3 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.hpp @@ -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: diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 2c5c17f4d8..e0ea71fd73 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -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_ptr(event); - seq->append((*i)->on_event()); + seq->append((*i)->on_event(), next_event_id ()); inserted_events.push_back( boost::shared_ptr >( new Event