Merge branch 'pretest' into wip.interfaces

diff --cc cs-job-create
index da7f8649dff848e705e30debb217119ac4a78f86,228271be3cb2a8eaf736dfa5e3af84cadd62f23c..2879e114216ffdb1349fd083d89039845832873e
--- 1/cs-job-create
--- 2/cs-job-create
+++ b/cs-job-create
@@@ -15,10 -15,13 +15,11 @@@ my ($flight,$job,$recipe,@runvars) = @A
  my $jobsonly= $ENV{OSSTEST_JOBS_ONLY};
  
  exit 0 if grep { $_ eq 'disable' } @runvars;
- exit 0 if defined($jobsonly) && !grep { $_ eq $job } split /[:,]/, $jobsonly;
+ exit 0 if defined($jobsonly) &&
+     !grep { $job =~ m/^$_$/ } split /[:,]/, $jobsonly;
  
  $dbh_tests->
 -    selectrow_arrayref("SELECT * FROM flights where flight= $flight")
 +    selectrow_arrayref("SELECT * FROM flights where flight=?", {}, $flight)
      or die "$flight ?";
  
  our %runvars;

diff --cc ts-xen-install
Simple merge