Commit 48d21d2e authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Some minor bug fixes plus changed the makefile to install target binaries

directly to ops via opsdir.

* Force tty allocation in the control script. Also force protocol 1 and
  ignore the users .ssh/config file.

* Do not start up linktest on delay nodes!
parent f39df347
...@@ -79,11 +79,13 @@ $(LTEVENT_OBJS): ../lib/libevent.a ../lib/event.h ...@@ -79,11 +79,13 @@ $(LTEVENT_OBJS): ../lib/libevent.a ../lib/event.h
# We install just enough to fire off the test from boss and wait. # We install just enough to fire off the test from boss and wait.
install: install:
$(INSTALL_PROGRAM) $(LOCAL_BINDIR)/$(LTEVENT) $(INSTALL_LIBEXECDIR)
$(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR) $(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR)
$(INSTALL_PROGRAM) $(SCRIPT_RUN) $(INSTALL_BINDIR)
$(INSTALL_PROGRAM) $(SCRIPT_CONTROL) $(INSTALL_SBINDIR) $(INSTALL_PROGRAM) $(SCRIPT_CONTROL) $(INSTALL_SBINDIR)
$(INSTALL_DATA) $(SRCDIR)/linktest.html $(INSTALL_WWWDIR)/doc $(INSTALL_DATA) $(SRCDIR)/linktest.html $(INSTALL_WWWDIR)/doc
$(INSTALL_PROGRAM) $(SCRIPT_RUN) \
$(INSTALL_DIR)/opsdir/bin/$(SCRIPT_RUN)
$(INSTALL_PROGRAM) $(LOCAL_BINDIR)/$(LTEVENT) \
$(INSTALL_DIR)/opsdir/libexec/$(LTEVENT)
control-install: control-install:
$(INSTALL_PROGRAM) $(LOCAL_BINDIR)/$(LTEVENT) $(INSTALL_LIBEXECDIR) $(INSTALL_PROGRAM) $(LOCAL_BINDIR)/$(LTEVENT) $(INSTALL_LIBEXECDIR)
...@@ -102,5 +104,5 @@ lt-install: ...@@ -102,5 +104,5 @@ lt-install:
$(INSTALL_PROGRAM) $(SCRIPT) $(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT) $(INSTALL_PROGRAM) $(SCRIPT) $(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT)
clean: clean:
rm -f *.o $(TESTS) rm -f *.o $(TESTS) $(SCRIPT) $(SCRIPT_RUN) weblinktest linktest_control
rm -rf $(LOCAL_BINDIR) rm -rf $(LOCAL_BINDIR)
...@@ -227,7 +227,8 @@ if ($child_pid) { ...@@ -227,7 +227,8 @@ if ($child_pid) {
# We tell ssh to allocate a tty so that we can kill it with TERM and have # We tell ssh to allocate a tty so that we can kill it with TERM and have
# everything die off properly. # everything die off properly.
# #
my $cmd = "$SSH -t -host $CONTROL $TB/bin/run_linktest.pl -v"; my $cmd = "$SSH -t -t -1 -F /dev/null " .
"-host $CONTROL $TB/bin/run_linktest.pl -v";
$cmd .= " -d $debug" $cmd .= " -d $debug"
if ($debug); if ($debug);
$cmd .= " -t $timeout" $cmd .= " -t $timeout"
......
...@@ -32,7 +32,7 @@ use libtmcc; ...@@ -32,7 +32,7 @@ use libtmcc;
# Exit if not a valid node to run linktest on. # Exit if not a valid node to run linktest on.
# #
exit(0) exit(0)
if (MFS() || REMOTE() || SIMHOST() || JAILHOST()); if (MFS() || REMOTE() || SIMHOST() || JAILHOST() || ISDELAYNODE());
# #
# Parse command arguments. Once we return from getopts, all that should be # Parse command arguments. Once we return from getopts, all that should be
......
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