From a3add67b8809f12e8e2acb2d1ea6a74c661b8f36 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Wed, 28 May 2014 01:09:59 +0200 Subject: [PATCH] Adding PingCCN test --- src/nepi/resources/linux/ns3/ns3pingdceapplication.py | 10 ++++++++-- .../linux/ns3/{ns3pingdce.py => ns3dceping.py} | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) rename test/resources/linux/ns3/{ns3pingdce.py => ns3dceping.py} (98%) diff --git a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py index 6534b1e7..b0640810 100644 --- a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py +++ b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py @@ -191,11 +191,17 @@ class LinuxDcePing(LinuxNS3DceApplication): @property def _build(self): - return ("tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && " + return (" ( " + " test -f ${SRC}/iputils-s20101006.tar.bz2 && " + " echo 'binaries found, nothing to do' " + " ) || ( " + "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && " "cd iputils-s20101006/ && " "sed -i 's/CFLAGS=/CFLAGS+=/g' Makefile && " "make CFLAGS=-fPIC LDFLAGS=-pie ping && " - "cp ping ${BIN_DCE} && cd - ") + "cp ping ${BIN_DCE} && cd - " + " )" + ) @property def _arguments(self): diff --git a/test/resources/linux/ns3/ns3pingdce.py b/test/resources/linux/ns3/ns3dceping.py similarity index 98% rename from test/resources/linux/ns3/ns3pingdce.py rename to test/resources/linux/ns3/ns3dceping.py index ffa19bb3..87a8da25 100644 --- a/test/resources/linux/ns3/ns3pingdce.py +++ b/test/resources/linux/ns3/ns3dceping.py @@ -71,7 +71,7 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase): self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME']) def test_dce_ping(self): - ec = ExperimentController(exp_id = "test-dce-ping") + ec = ExperimentController(exp_id = "test-dceping") node = ec.register_resource("LinuxNode") ec.set(node, "hostname", self.fedora_host) -- 2.43.0