diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-01-13 10:24:09 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-01-13 10:24:09 +0100 |
commit | 3c5e1fd903ce18efe51672074e01d1637c4bc0b2 (patch) | |
tree | 94925b27c9bfa91b97f973a367d0e278a3f0bd54 /tests | |
parent | 40bf3aa5d2fd9d2aa6244ce8023ad1eed3bf0383 (diff) |
Remove additional thread support in performance test
We're always enabling threads now so this is not needed.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gobject/performance.c | 6 | ||||
-rwxr-xr-x | tests/gobject/run-performance.sh | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/tests/gobject/performance.c b/tests/gobject/performance.c index 6f1b5d077..c6269162b 100644 --- a/tests/gobject/performance.c +++ b/tests/gobject/performance.c @@ -32,14 +32,11 @@ #define TARGET_ROUND_TIME 0.004 static gboolean verbose = FALSE; -static gboolean init_threads = FALSE; static int test_length = DEFAULT_TEST_TIME; static GOptionEntry cmd_entries[] = { {"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Print extra information", NULL}, - {"threads", 't', 0, G_OPTION_ARG_NONE, &init_threads, - "Initialize threads", NULL}, {"seconds", 's', 0, G_OPTION_ARG_INT, &test_length, "Time to run each test in seconds", NULL}, {NULL} @@ -713,9 +710,6 @@ main (int argc, return 1; } - if (init_threads) - g_thread_init (NULL); - if (argc > 1) { for (i = 1; i < argc; i++) diff --git a/tests/gobject/run-performance.sh b/tests/gobject/run-performance.sh index d2f92cacb..f2d53dfef 100755 --- a/tests/gobject/run-performance.sh +++ b/tests/gobject/run-performance.sh @@ -3,5 +3,4 @@ DIR=`dirname $0`; (cd $DIR; make performance) ID=`git rev-list --max-count=1 HEAD` echo "Testing revision ${ID}" -$DIR/performance | tee "perf-${ID}-normal.log" -$DIR/performance -t | tee "perf-${ID}-threaded.log" +$DIR/performance | tee "perf-${ID}.log" |