CI: Fixed old-style CI test jobs
...run directly via `Jenkinsfile.rb` from a matrix job. In that
case have to to explicitly inhibit package test settings enabled
in spec project `stx:jv-branch` (which are there to define "standard"
test suite.
--- a/specs/reports-libjava.rbspec Thu Dec 22 22:25:06 2016 +0000
+++ b/specs/reports-libjava.rbspec Sun Dec 25 22:24:40 2016 +0000
@@ -1,43 +1,5 @@
project :'stx:libjava:reports-common' do
import :'stx:jv-branch:for-reports-only'
-
- tasks do
-
- redefine BUILD_DIR / 'stx' / 'librun' => BUILD_DIR do | t |
- checkout :'swing:private', 'stx/librun', :branch => 'branches/jv'
- end
-
-
- task :'test:pre' => [ BUILD_DIR / 'stx' / 'libjava' / 'tests' , ] do
- chdir BUILD_DIR / 'stx' / 'libjava' / 'libs' / 'java' do
- if win32? then
- cmd = 'ant.bat'
- else
- cmd = 'ant'
- end
- if not system cmd
- raise "Cannot run maven"
- end
- end
- end
-
- task :'install:jv:post' do
- bld_dir = BUILD_DIR / 'stx' / 'libjava'
- pkg_dir = $install_jv_dirs[:pkg_dir] / 'stx' / 'libjava'
-
- cp_rx bld_dir / 'examples' , pkg_dir / 'examples' do | fname |
- # fname is full path!!!
- /\.svn|CVS|\.cvsignore|tests/.match(fname) == nil
- end
-
- mkdir pkg_dir / 'java'
- cp_rx bld_dir / 'java' / 'libs' , pkg_dir / 'java' / 'libs' do | fname |
- # fname is full path!!!
- /\.svn|CVS|\.cvsignore|tests/.match(fname) == nil
- end
-
- end
- end
end
project :'stx:libjava:reports' do
--- a/specs/stx-jv.rbspec Thu Dec 22 22:25:06 2016 +0000
+++ b/specs/stx-jv.rbspec Sun Dec 25 22:24:40 2016 +0000
@@ -330,6 +330,14 @@
project :'stx:jv-branch:for-reports-only' do
import :'stx:jv-branch'
+ # Sigh, if we're about to run tests only, we don't want to
+ # run standard tests so we need to clean test flag.
+ package 'stx:libview/tests', :test => false;
+ package 'stx:libjava', :test => false;
+ package 'stx:libjava/tools', :test => false;
+ package 'stx:goodies/regression', :test => false;
+ package 'stx:libscm/mercurial', :test => false;
+
tasks do
task :'stx:projects/smalltalk:pre' do
chdir BUILD_DIR / 'stx' / 'projects' / 'smalltalk' do