[Xen-devel] [OSSTEST PATCH] PERLLIB, @INC: Add . in some places we missed

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

* cri-getconfig (invoked by many cr* scripts, standalone-reset, etc.)
* mgi-common (invoked by many mg*)
* Two literal perl -e includes in Tcl code.

I think this leaves no scripts which do not set PERLLIB or @INC,
either by themselves or by something they source with `.'.

Reported-by: George Dunlap <George.Dunlap@xxxxxxxxxx>
Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 cri-getconfig           | 2 ++
 mgi-common              | 2 ++
 tcl/JobDB-Executive.tcl | 1 +
 tcl/osstestlib.tcl      | 1 +
 4 files changed, 6 insertions(+)

diff --git a/cri-getconfig b/cri-getconfig
index b2c91ac..b891c9b 100644
--- a/cri-getconfig
+++ b/cri-getconfig
@@ -17,6 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+export PERLLIB=".${PERLLIB+:}${PERLLIB}"
+
 getconfig () {
         perl -e '
                 use Osstest;
diff --git a/mgi-common b/mgi-common
index 5081521..6ce3416 100644
--- a/mgi-common
+++ b/mgi-common
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+export PERLLIB=".${PERLLIB+:}${PERLLIB}"
+
 fail () { echo >&2 "$0: $1"; exit 1; }
 
 mg_update_org_pwd=$PWD
diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl
index 0734018..aacd946 100644
--- a/tcl/JobDB-Executive.tcl
+++ b/tcl/JobDB-Executive.tcl
@@ -147,6 +147,7 @@ proc db-ensure-open {} {
     catch { db-ensure-closed } ;# clean up any detritus
 
     set pl {
+       unshift @INC, qw(.);
        use Osstest;
        use Osstest::Executive;
        readglobalconfig();
diff --git a/tcl/osstestlib.tcl b/tcl/osstestlib.tcl
index b5a52d3..dba656a 100644
--- a/tcl/osstestlib.tcl
+++ b/tcl/osstestlib.tcl
@@ -22,6 +22,7 @@ package require Tclx
 proc readconfig {} {
     global c
     set pl {
+       unshift @INC, qw(.);
         use Osstest;
         readglobalconfig();
         foreach my $k (sort keys %c) {
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel