Merge branch 'master' of scm.dev.nokia.troll.no:bm/jasplins-bm2

1 files changed, 3 insertions, 10 deletions

diff --git a/scripts/bm2_result_watcher.pl b/scripts/bm2_result_watcher.pl
index 8d4e0ae..61ba8ee 100755
--- a/scripts/bm2_result_watcher.pl
+++ b/scripts/bm2_result_watcher.pl
@@ -86,19 +86,12 @@ until ($dieNow) {
           if ($fi =~ /<Branch>(.*)<\/Branch>/)             { $branch   = $1; last; }
         }
         close(FILE);
-        my @args   = ( "/home/qt/bm2/scripts/uploadresults.py",
-                       $hostname,
-                       $platform,
-                       $branch,
-                       $sha1,
-                       $timestamp,
-                       $workdir . $f,
-                       "bm" );
-        if (system(@args) == 0) {
+        my $upload_exe = "/home/qt/bm2/scripts/uploadresults.py --db bm --host $hostname --platform $platform --branch $branch --sha1 $sha1 --file $workdir$f";
+        if (system($upload_exe) == 0) {
           system("/bin/cp $workdir$f /home/qt/tmp_benchmarks2") == 0 or logEntry("Couldn't execute `cp': " . $workdir . $f);
           system("/bin/rm -f $workdir$f") == 0 or logEntry("Couldn't execute `rm': " . $workdir . $f);
         } else {
-          logEntry("Couldn't execute: @args");
+          logEntry("Couldn't execute: uploadresults.py");
         }
       }
     }