[gnome-ostree] integrationtest: Execute tests in parallel

[Colin Walters <walters src gnome org>]

commit 55c6005ed91d522eb8fdab66d9343454f3fce347
Author: Colin Walters <walters verbum org>
Date:   Tue May 21 21:58:58 2013 -0400

    integrationtest: Execute tests in parallel

 src/js/libqa.js                      |    3 +--
 src/js/tasks/task-integrationtest.js |    2 +-
 src/js/tasks/testbase.js             |    3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/js/libqa.js b/src/js/libqa.js
index 00f6fa7..c2c181a 100644
--- a/src/js/libqa.js
+++ b/src/js/libqa.js
@@ -26,8 +26,7 @@ const GuestFish = imports.guestfish;
 
 const DEFAULT_GF_PARTITION_OPTS = ['-m', '/dev/sda3', '-m', '/dev/sda1:/boot'];
 const DEFAULT_QEMU_OPTS = ['-vga', 'std', '-m', '768M',
-                           '-usb', '-usbdevice', 'tablet',
-                          '-smp', '1,sockets=1,cores=1,threads=1'];
+                           '-usb', '-usbdevice', 'tablet'];
 
 
 function newReadWriteMount(diskpath, cancellable) {
diff --git a/src/js/tasks/task-integrationtest.js b/src/js/tasks/task-integrationtest.js
index 7e60693..a6531d5 100644
--- a/src/js/tasks/task-integrationtest.js
+++ b/src/js/tasks/task-integrationtest.js
@@ -75,7 +75,7 @@ const TaskIntegrationTest = new Lang.Class({
         let desktopFile = '[Desktop Entry]\n\
 Encoding=UTF-8\n\
 Name=GNOME installed tests runner\n\
-Exec=gnome-desktop-testing-runner\n\
+Exec=gnome-desktop-testing-runner --parallel 0\n\
 Terminal=false\n\
 Type=Application\n';
         let dest = deployEtcDir.resolve_relative_path('xdg/autostart/gnome-desktop-testing.desktop');
diff --git a/src/js/tasks/testbase.js b/src/js/tasks/testbase.js
index b38ad85..64ec6ec 100644
--- a/src/js/tasks/testbase.js
+++ b/src/js/tasks/testbase.js
@@ -262,6 +262,9 @@ const TestOneDisk = new Lang.Class({
 
         let qemuArgs = [LibQA.getQemuPath()];
         qemuArgs.push.apply(qemuArgs, LibQA.DEFAULT_QEMU_OPTS);
+    
+        let nCores = Math.min(16, GLib.get_num_processors());
+        qemuArgs.push.apply(qemuArgs, ['-smp', ''+nCores]);
 
         let diskClone = subworkdir.get_child('testoverlay-' + diskPath.get_basename());
         GSystem.shutil_rm_rf(diskClone, cancellable);