[Pkg-mozext-commits] [compactheader] 391/441: Yet another update of tests

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 596eebe1c00b84614e3068279ccb762df13b2fe2
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date:   Thu Aug 15 01:42:39 2013 +0200

    Yet another update of tests
---
 test/executeTests.pl | 13 +++++++++----
 test/testapps.csv    |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/executeTests.pl b/test/executeTests.pl
index 8d1de50..100ff10 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -237,10 +237,15 @@ foreach my $pid (@children) {
   # We have out own tests for this, so delete it
   unlink("message-header/test-header-toolbar.js");
   my @compatibility_apps = (
+    glob("../../ftp/$ostype-$hosttype-$version/addon-2313*.xpi"),
     glob("../../ftp/$ostype-$hosttype-$version/lightning*.xpi"),
     "$dispMUAfile",
+    "../../ftp/addon-562*.xpi",
+    "$xpi"
 #    "$mnenhyfile" # activate when mozmill can handle this addon:
   );
+  
+  @compatibility_apps = grep { $_ && !m/^\s+$/ } @compatibility_apps;
 
   my $comp_apps = join(",", @compatibility_apps);
   print $comp_apps;
@@ -252,10 +257,10 @@ foreach my $pid (@children) {
   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t message-header 2>&1`;
   print "\n$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t folder-display 2>&1\n";
   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t folder-display 2>&1`;
-  print "\n$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-toolbar.js 2>&1\n";
-  $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-toolbar.js 2>&1`;
-  print "\n$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-preferences.js 2>&1\n";
-  $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-preferences.js 2>&1`;
+  print "\n$python runtest.py --binary=../thunderbird/$appbin -a $comp_apps -t compactheader/test-compactheader-toolbar.js 2>&1\n";
+  $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $comp_apps -t compactheader/test-compactheader-toolbar.js 2>&1`;
+  print "\n$python runtest.py --binary=../thunderbird/$appbin -a $comp_apps -t compactheader/test-compactheader-preferences.js 2>&1\n";
+  $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $comp_apps -t compactheader/test-compactheader-preferences.js 2>&1`;
 
   chdir "$currentdir";
   my @timeData = localtime(time);
diff --git a/test/testapps.csv b/test/testapps.csv
index fa5bb06..9883165 100644
--- a/test/testapps.csv
+++ b/test/testapps.csv
@@ -2,9 +2,9 @@
 "linux","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/17.0.7esr-candidates/build1/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://addons.mozilla.org/thunderbird/downloads/latest/2313/platform:2/addon-2313-latest.xpi"
 "linux","x86_64","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/17.0.7esr-candidates/build1/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://addons.mozilla.org/thunderbird/downloads/latest/2313/platform:2/addon-2313-latest.xpi"
 
-"msys","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/win32/en-US/","thunderbird-_VER_.zip","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/win32/lightning-2.6b1.xpi"
-"linux","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/linux-x86_64/lightning-2.6b1.xpi"
-"linux","x86_64","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/linux/lightning-2.6b1.xpi"
+"msys","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/win32/en-US/","thunderbird-_VER_.zip","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/win32/lightning-2.6b1.en-US.win32.xpi"
+"linux","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/linux-i686/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/linux-x86_64/lightning-2.6b1.en-US.linux-x86_64.xpi"
+"linux","x86_64","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/24.0b1-candidates/build2/linux-x86_64/en-US/","thunderbird-_VER_.tar.bz2","thunderbird-_VER_.tests.zip",".checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/2.6b1-candidates/build2/linux-i686/lightning-2.6b1.en-US.linux-i686.xpi"
 
 "msys","i686","https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-comm-aurora/","thunderbird-_VER_.en-US.win32.zip","thunderbird-_VER_.en-US.win32.tests.zip",".en-US.win32.checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-aurora/lightning-2.7a2.en-US.win32.xpi"
 "linux","i686""https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-comm-aurora/","thunderbird-_VER_.en-US.linux-i686.tar.bz2","thunderbird-_VER_.en-US.linux-i686.tests.zip",".en-US.linux-i686.checksums","https://ftp.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-aurora/lightning-2.7a2.en-US.linux-i686.xpi"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git