aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicholas Nethercote <[email protected]>2016-11-02 17:54:53 +1300
committerMatthew Gregan <[email protected]>2016-11-11 09:44:29 +1300
commit474c8ceb4b9b5e45408dfc10d00c5757003b8d41 (patch)
treee9ca7c097a9410fe9d5cdaf758848561de5da2d5
parent46d12e9ae6fa9c233bc32812b13185ee7df8d3fd (diff)
downloadcubeb-474c8ceb4b9b5e45408dfc10d00c5757003b8d41.tar.gz
cubeb-474c8ceb4b9b5e45408dfc10d00c5757003b8d41.zip
Remove unnecessary XPCOM dependency from unit tests. BMO #1314514.
-rw-r--r--test/test_audio.cpp7
-rw-r--r--test/test_duplex.cpp7
-rw-r--r--test/test_latency.cpp7
-rw-r--r--test/test_record.cpp7
-rw-r--r--test/test_sanity.cpp7
-rw-r--r--test/test_tone.cpp7
6 files changed, 0 insertions, 42 deletions
diff --git a/test/test_audio.cpp b/test/test_audio.cpp
index 4943223..f96c0f4 100644
--- a/test/test_audio.cpp
+++ b/test/test_audio.cpp
@@ -19,9 +19,6 @@
#include "cubeb/cubeb.h"
#include "common.h"
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define MAX_NUM_CHANNELS 32
@@ -282,10 +279,6 @@ void run_channel_rate_test()
int main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_audio");
-#endif
-
assert(run_panning_volume_test(0) == CUBEB_OK);
assert(run_panning_volume_test(1) == CUBEB_OK);
run_channel_rate_test();
diff --git a/test/test_duplex.cpp b/test/test_duplex.cpp
index c5d02d7..7bae010 100644
--- a/test/test_duplex.cpp
+++ b/test/test_duplex.cpp
@@ -18,9 +18,6 @@
#include "cubeb/cubeb.h"
#include "common.h"
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define SAMPLE_FREQUENCY 48000
#if (defined(_WIN32) || defined(__WIN32__))
@@ -91,10 +88,6 @@ void state_cb(cubeb_stream * stream, void * /*user*/, cubeb_state state)
int main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_duplex");
-#endif
-
cubeb *ctx;
cubeb_stream *stream;
cubeb_stream_params input_params;
diff --git a/test/test_latency.cpp b/test/test_latency.cpp
index 0586b1a..dfbccdd 100644
--- a/test/test_latency.cpp
+++ b/test/test_latency.cpp
@@ -5,18 +5,11 @@
#include "cubeb/cubeb.h"
#include <assert.h>
#include <stdio.h>
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define LOG(msg) fprintf(stderr, "%s\n", msg);
int main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_latency");
-#endif
-
cubeb * ctx = NULL;
int r;
uint32_t max_channels;
diff --git a/test/test_record.cpp b/test/test_record.cpp
index 681e164..33aae19 100644
--- a/test/test_record.cpp
+++ b/test/test_record.cpp
@@ -17,9 +17,6 @@
#include "cubeb/cubeb.h"
#include "common.h"
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define SAMPLE_FREQUENCY 48000
#if (defined(_WIN32) || defined(__WIN32__))
@@ -79,10 +76,6 @@ void state_cb(cubeb_stream * stream, void * /*user*/, cubeb_state state)
int main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_record");
-#endif
-
cubeb *ctx;
cubeb_stream *stream;
cubeb_stream_params params;
diff --git a/test/test_sanity.cpp b/test/test_sanity.cpp
index 77973ff..5d56a90 100644
--- a/test/test_sanity.cpp
+++ b/test/test_sanity.cpp
@@ -14,9 +14,6 @@
#include <string.h>
#include <math.h>
#include "common.h"
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define BEGIN_TEST fprintf(stderr, "START %s\n", __func__)
#define END_TEST fprintf(stderr, "END %s\n", __func__)
@@ -631,10 +628,6 @@ int is_windows_7()
int
main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_sanity");
-#endif
-
test_init_destroy_context();
test_init_destroy_multiple_contexts();
test_context_variables();
diff --git a/test/test_tone.cpp b/test/test_tone.cpp
index 3c6e0ec..7a3c762 100644
--- a/test/test_tone.cpp
+++ b/test/test_tone.cpp
@@ -18,9 +18,6 @@
#include "cubeb/cubeb.h"
#include "common.h"
-#ifdef CUBEB_GECKO_BUILD
-#include "TestHarness.h"
-#endif
#define SAMPLE_FREQUENCY 48000
#if (defined(_WIN32) || defined(__WIN32__))
@@ -100,10 +97,6 @@ void state_cb(cubeb_stream *stream, void *user, cubeb_state state)
int main(int /*argc*/, char * /*argv*/[])
{
-#ifdef CUBEB_GECKO_BUILD
- ScopedXPCOM xpcom("test_tone");
-#endif
-
cubeb *ctx;
cubeb_stream *stream;
cubeb_stream_params params;