X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2Fdata%2Fdecoderstack.cpp;h=3bb2f3eb310d52f525845142cd52baf51e109a8a;hb=11fa89791593bdd400519f4a706241a58c0e37e6;hp=d6e4f75a8a898dbbf3aea473690dcffdbbdbfb71;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git
diff --git a/test/data/decoderstack.cpp b/test/data/decoderstack.cpp
index d6e4f75..3bb2f3e 100644
--- a/test/data/decoderstack.cpp
+++ b/test/data/decoderstack.cpp
@@ -14,42 +14,43 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#if 0
+
#include /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include
-#include
+#include
-#include "../../pv/data/decoderstack.h"
-#include "../../pv/devicemanager.h"
-#include "../../pv/sigsession.h"
-#include "../../pv/view/decodetrace.h"
+#include "../../pv/data/decoderstack.hpp"
+#include "../../pv/devicemanager.hpp"
+#include "../../pv/session.hpp"
+#include "../../pv/view/decodetrace.hpp"
-using boost::shared_ptr;
using pv::data::DecoderStack;
using pv::data::decode::Decoder;
using pv::view::DecodeTrace;
+using std::shared_ptr;
using std::vector;
BOOST_AUTO_TEST_SUITE(DecoderStackTest)
BOOST_AUTO_TEST_CASE(TwoDecoderStack)
{
- sr_context *ctx = NULL;
+ sr_context *ctx = nullptr;
BOOST_REQUIRE(sr_init(&ctx) == SR_OK);
BOOST_REQUIRE(ctx);
- BOOST_REQUIRE(srd_init(NULL) == SRD_OK);
+ BOOST_REQUIRE(srd_init(nullptr) == SRD_OK);
srd_decoder_load_all();
{
pv::DeviceManager dm(ctx);
- pv::SigSession ss(dm);
+ pv::Session ss(dm);
const GSList *l = srd_decoder_list();
BOOST_REQUIRE(l);
@@ -70,8 +71,8 @@ BOOST_AUTO_TEST_CASE(TwoDecoderStack)
BOOST_REQUIRE(dec1);
// Wait for the decode threads to complete
- dec0->_decode_thread.join();
- dec1->_decode_thread.join();
+ dec0->decode_thread_.join();
+ dec1->decode_thread_.join();
// Check there were no errors
BOOST_CHECK_EQUAL(dec0->error_message().isEmpty(), true);
@@ -84,3 +85,4 @@ BOOST_AUTO_TEST_CASE(TwoDecoderStack)
}
BOOST_AUTO_TEST_SUITE_END()
+#endif