wip reorg fixes

diff --git a/Osstest/JobDB/Standalone.pm b/Osstest/JobDB/Standalone.pm
index b1c1d4e42e73666f44069c578bf7802a33ef9027..d0c533e63a59d573e0cba1fffbe837d9a8ecf28b 100644 (file)
--- a/Osstest/JobDB/Standalone.pm
+++ b/Osstest/JobDB/Standalone.pm
@@ -42,8 +42,8 @@ sub open ($) {
 sub flight_create ($$$) {
     my ($obj, $branch, $intended) = @_;
     my $fl = $ENV{'OSSTEST_FLIGHT'};
+    $fl = 'standalone' unless defined $fl && length $fl;
     die "flight names may not contain ." if $fl =~ m/\./;
-    $fl = 'standalone' if !length $fl;
     foreach my $table (qw(runvars jobs flights)) {
        $dbh_tests->do(<<END, {}, $fl)
             DELETE FROM $table WHERE flight = ?

diff --git a/cri-args-hostlists b/cri-args-hostlists
index ed78dffa12e4e7c7f4b756fba850f547555360b2..e9d06c3bd27a1a3135bc27c9ffa55628d045426a 100644 (file)
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -1,5 +1,7 @@
 #
 
+export OSSTEST_CONFIG=production-config
+
 check_stop () {
        for stop_dir in '' $HOME/testing.git/; do
                if test -f $stop_dir${1}stop; then

diff --git a/cri-common b/cri-common
index d8421f1399a3b8e5219baaa1cf437062154183d9..e685512276a212a6ae086feda51b7543709dcc0d 100644 (file)
--- a/cri-common
+++ b/cri-common
@@ -4,8 +4,6 @@
 
 umask 002
 
-export OSSTEST_CONFIG=production-config
-
 repo_tree_rev_fetch_git () {
        local treename=$1
        local remoteurl=$2

diff --git a/cri-getconfig b/cri-getconfig
index 3847f754c94530e06de244e942f4e07f75acbec8..551508ffafc33d1d1dbe2cb45c448e54077a8c93 100644 (file)
--- a/cri-getconfig
+++ b/cri-getconfig
@@ -4,7 +4,6 @@ getconfig () {
         perl -e '
                 use Osstest;
                 readglobalconfig();
-die "'$1' caps err" if "'$1'" =~ m/A-Z/;
                 print $c{"'$1'"} or die $!;
         '
 }

diff --git a/make-flight b/make-flight
index 1b8cdbd406a26fa826e5bfe1ae2e1b8f0e1c5897..8d8eb4bff3777a2bad72933180e7dc8766b7e3f5 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 branch=$1