Commit 5b8f9f7d authored by Leigh Stoller's avatar Leigh Stoller

Small set of changes to allow snmpit_new to use different set of

libraries from snmpit_test directory, See previous commit.
parent 3dcbc68c
......@@ -2672,6 +2672,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
backend/editnodetype backend/editsitevars backend/newimageid \
backend/editgroup backend/newimageid_ez \
tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
tbsetup/snmpit_test/GNUmakefile \
tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/power_mail.pm tbsetup/power_whol.pm \
......
......@@ -903,6 +903,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
backend/editnodetype backend/editsitevars backend/newimageid \
backend/editgroup backend/newimageid_ez \
tbsetup/GNUmakefile tbsetup/console_setup tbsetup/spewlogfile \
tbsetup/snmpit_test/GNUmakefile \
tbsetup/spewrpmtar tbsetup/gentopofile tbsetup/power_sgmote.pm \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/power_mail.pm tbsetup/power_whol.pm \
......
......@@ -16,7 +16,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = checkpass ns2ir nseparse checkup template_cvsroot
SUBDIRS = checkpass ns2ir nseparse checkup template_cvsroot snmpit_test
ifeq ($(NSVERIFY),1)
SUBDIRS += nsverify
endif
......
......@@ -476,7 +476,7 @@ if ($pid && $eid) {
#
# See if we use the alternate version of snmpit from Rob.
#
if ($MAINSITE && $TB eq "/usr/testbed" && !$opt{Z}) {
if ($TB eq "/usr/testbed" && !$opt{Z}) {
my $group = (defined($experiment) ? $experiment->GetGroup() : undef);
$EmulabFeatures::verbose = 0;
my $robsnmpit =
......
......@@ -12,27 +12,28 @@
#
# Configure variables
#
use lib '@prefix@/lib';
my $TESTMODE = @TESTMODE@;
my $ELABINELAB = @ELABINELAB@;
my $NOSTACKMIB = @NOSTACKMIB@;
my $MAINSITE = @TBMAINSITE@;
my $TB = '@prefix@';
use lib '@prefix@/lib';
use libdb;
use User;
use Experiment;
use snmpit_lib;
use snmpit_remote;
use libtblog;
use EmulabFeatures;
use Lan;
use English;
use Getopt::Long;
use strict;
# Alternate version of libraries.
use lib '@prefix@/lib/snmpit_test';
use snmpit_lib;
use snmpit_remote;
# Protos
sub parseStatusString($);
sub debug($);
......
......@@ -18,7 +18,6 @@ use Exporter;
# Must come after package declaration!
use lib '@prefix@/lib';
use English;
use libdb;
use libtestbed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment