Commit ecb5fdec authored by Leigh B Stoller's avatar Leigh B Stoller

Checkpoint event/linktest move.

parent 1b42f552
...@@ -4830,6 +4830,12 @@ outfiles="Makeconf GNUmakefile \ ...@@ -4830,6 +4830,12 @@ outfiles="Makeconf GNUmakefile \
event/proxy/GNUmakefile \ event/proxy/GNUmakefile \
event/tevc/GNUmakefile \ event/tevc/GNUmakefile \
event/trafgen/GNUmakefile \ event/trafgen/GNUmakefile \
event/linktest/GNUmakefile \
event/linktest/iperf/GNUmakefile \
event/linktest/rude/GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \
event/linktest/run_linktest.pl \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -158,6 +158,12 @@ outfiles="Makeconf GNUmakefile \ ...@@ -158,6 +158,12 @@ outfiles="Makeconf GNUmakefile \
event/proxy/GNUmakefile \ event/proxy/GNUmakefile \
event/tevc/GNUmakefile \ event/tevc/GNUmakefile \
event/trafgen/GNUmakefile \ event/trafgen/GNUmakefile \
event/linktest/GNUmakefile \
event/linktest/iperf/GNUmakefile \
event/linktest/rude/GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \
event/linktest/run_linktest.pl \
tools/GNUmakefile \ tools/GNUmakefile \
tools/pcapper/GNUmakefile \ tools/pcapper/GNUmakefile \
sensors/GNUmakefile \ sensors/GNUmakefile \
......
...@@ -10,7 +10,7 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR)) ...@@ -10,7 +10,7 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = program-agent link-agent tevc proxy SUBDIRS = program-agent link-agent tevc proxy linktest
ifneq ($(SYSTEM),CYGWIN_NT-5.1) ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen SUBDIRS += trafgen
endif endif
......
...@@ -3,14 +3,13 @@ ...@@ -3,14 +3,13 @@
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../.. OBJDIR = @top_builddir@
SUBDIR = event/linktest SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
LIBTBDIR = $(OBJDIR)/lib/libtb LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = ${OBJDIR}/lib/event LIBEVENTDIR = ${OBJDIR}/lib/event
NSTOIRDIR = $(TESTBED_SRCDIR)/tbsetup/ns2ir
DAEMON = linktest DAEMON = linktest
LTEVENT = ltevent LTEVENT = ltevent
SCRIPT = linktest.pl SCRIPT = linktest.pl
...@@ -18,8 +17,6 @@ SCRIPT_ELAB = elab_linktest.pl ...@@ -18,8 +17,6 @@ SCRIPT_ELAB = elab_linktest.pl
SCRIPT_RUN = run_linktest.pl SCRIPT_RUN = run_linktest.pl
SCRIPT_PROXY = linktest.proxy SCRIPT_PROXY = linktest.proxy
SCRIPT_CONTROL = linktest_control SCRIPT_CONTROL = linktest_control
SCRIPT_TBCOMPAT = tb_compat.tcl
SCRIPT_NSTB_COMPAT = nstb_compat.tcl
# These scripts installed setuid, with sudo. # These scripts installed setuid, with sudo.
SETUID_BIN_SCRIPTS = SETUID_BIN_SCRIPTS =
...@@ -95,7 +92,7 @@ $(DAEMON_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h ...@@ -95,7 +92,7 @@ $(DAEMON_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(LTEVENT_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h $(LTEVENT_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/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: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \ boss-install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
$(INSTALL_SBINDIR)/$(SCRIPT_CONTROL) $(INSTALL_SBINDIR)/$(SCRIPT_CONTROL)
$(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR) $(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR)
-mkdir -p $(INSTALL_DIR)/opsdir/bin -mkdir -p $(INSTALL_DIR)/opsdir/bin
...@@ -107,11 +104,6 @@ install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \ ...@@ -107,11 +104,6 @@ install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
$(INSTALL_DIR)/opsdir/sbin/$(SCRIPT_PROXY) $(INSTALL_DIR)/opsdir/sbin/$(SCRIPT_PROXY)
$(INSTALL_PROGRAM) $(LTEVENT) \ $(INSTALL_PROGRAM) $(LTEVENT) \
$(INSTALL_DIR)/opsdir/libexec/$(LTEVENT) $(INSTALL_DIR)/opsdir/libexec/$(LTEVENT)
@echo "Don't forget to do a post-install as root"
post-install:
chown root $(INSTALL_SBINDIR)/$(SCRIPT_CONTROL)
chmod u+s $(INSTALL_SBINDIR)/$(SCRIPT_CONTROL)
control-install: binaries $(SCRIPT_RUN) $(SCRIPT_PROXY) control-install: binaries $(SCRIPT_RUN) $(SCRIPT_PROXY)
$(INSTALL_PROGRAM) $(LTEVENT) $(INSTALL_LIBEXECDIR) $(INSTALL_PROGRAM) $(LTEVENT) $(INSTALL_LIBEXECDIR)
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../.. OBJDIR = @top_builddir@
SUBDIR = event/linktest/iperf SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
TARBALL = iperf-2.0.2.tar.gz TARBALL = iperf-2.0.2.tar.gz
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../.. OBJDIR = @top_builddir@
SUBDIR = event/linktest/rude SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
# be sure to change version in rude-fetch.sh too # be sure to change version in rude-fetch.sh too
VERSION = 0.70 VERSION = 0.70
......
...@@ -5623,13 +5623,7 @@ else ...@@ -5623,13 +5623,7 @@ else
event/nsetrafgen/nse-makepatch \ event/nsetrafgen/nse-makepatch \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
event/stated/waitForState \ event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated \ event/stated/GNUmakefile event/stated/stated"
event/linktest/GNUmakefile \
event/linktest/iperf/GNUmakefile \
event/linktest/rude/GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \
event/linktest/run_linktest.pl";
optional_subdirs="$optional_subdirs event"; optional_subdirs="$optional_subdirs event";
EVENTSYS=1; EVENTSYS=1;
...@@ -7231,6 +7225,13 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -7231,6 +7225,13 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/event/proxy/GNUmakefile \ clientside/event/proxy/GNUmakefile \
clientside/event/tevc/GNUmakefile \ clientside/event/tevc/GNUmakefile \
clientside/event/trafgen/GNUmakefile \ clientside/event/trafgen/GNUmakefile \
clientside/event/linktest/GNUmakefile \
clientside/event/linktest/iperf/GNUmakefile \
clientside/event/linktest/rude/GNUmakefile \
clientside/event/linktest/weblinktest \
clientside/event/linktest/linktest.proxy \
clientside/event/linktest/linktest_control \
clientside/event/linktest/run_linktest.pl \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -712,13 +712,7 @@ else ...@@ -712,13 +712,7 @@ else
event/nsetrafgen/nse-makepatch \ event/nsetrafgen/nse-makepatch \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
event/stated/waitForState \ event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated \ event/stated/GNUmakefile event/stated/stated"
event/linktest/GNUmakefile \
event/linktest/iperf/GNUmakefile \
event/linktest/rude/GNUmakefile \
event/linktest/weblinktest event/linktest/linktest.proxy \
event/linktest/linktest_control \
event/linktest/run_linktest.pl";
optional_subdirs="$optional_subdirs event"; optional_subdirs="$optional_subdirs event";
EVENTSYS=1; EVENTSYS=1;
...@@ -1096,6 +1090,13 @@ outfiles="$outfiles clientside/GNUmakefile \ ...@@ -1096,6 +1090,13 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/event/proxy/GNUmakefile \ clientside/event/proxy/GNUmakefile \
clientside/event/tevc/GNUmakefile \ clientside/event/tevc/GNUmakefile \
clientside/event/trafgen/GNUmakefile \ clientside/event/trafgen/GNUmakefile \
clientside/event/linktest/GNUmakefile \
clientside/event/linktest/iperf/GNUmakefile \
clientside/event/linktest/rude/GNUmakefile \
clientside/event/linktest/weblinktest \
clientside/event/linktest/linktest.proxy \
clientside/event/linktest/linktest_control \
clientside/event/linktest/run_linktest.pl \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile" clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
# #
......
...@@ -14,7 +14,7 @@ include $(OBJDIR)/Makeconf ...@@ -14,7 +14,7 @@ include $(OBJDIR)/Makeconf
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
SUBDIRS = proxy example linktest SUBDIRS = proxy example
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/') FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL)) FBSDMAJ := $(basename $(FBSDREL))
...@@ -42,7 +42,6 @@ ifeq ($(ISMAINSITE),1) ...@@ -42,7 +42,6 @@ ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched install @$(MAKE) -C new_sched install
endif endif
@$(MAKE) -C stated install @$(MAKE) -C stated install
@$(MAKE) -C linktest install
@$(MAKE) -C proxy install @$(MAKE) -C proxy install
client: client-subdirs client: client-subdirs
...@@ -53,7 +52,6 @@ control-install: ...@@ -53,7 +52,6 @@ control-install:
ifeq ($(ISMAINSITE),1) ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched control-install @$(MAKE) -C new_sched control-install
endif endif
@$(MAKE) -C linktest control-install
@$(MAKE) -C proxy control-install @$(MAKE) -C proxy control-install
post-install: post-install:
......
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