From 22174dcc54a358d886a718e8c36d0d50e742a468 Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Fri, 3 Jun 2016 14:50:14 +0800 Subject: ubuntu-server-cloudimg-modify: adjust install location of RAMspeed Unify tool install location Change-Id: I45fc76a0631187136a2602d1a9c26f3df94ce9dd Signed-off-by: JingLu5 --- tests/unit/benchmark/scenarios/compute/test_ramspeed.py | 3 ++- tools/ubuntu-server-cloudimg-modify.sh | 5 ++--- yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash | 2 +- yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py index 3de84c74c..100102d19 100644 --- a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py +++ b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py @@ -228,7 +228,8 @@ class RamspeedTestCase(unittest.TestCase): args = {'options': options} r = ramspeed.Ramspeed(args, self.ctx) - mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for Ramspeed scenario') + mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for \ + Ramspeed scenario') self.assertRaises(RuntimeError, r.run, self.result) diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh index 4a7d24bbb..2e8399a9b 100755 --- a/tools/ubuntu-server-cloudimg-modify.sh +++ b/tools/ubuntu-server-cloudimg-modify.sh @@ -62,9 +62,8 @@ apt-get install -y \ git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT make --directory /opt/tempT/UnixBench/ - -git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT2 -cd /opt/tempT2/ramspeed-2.6.0 +git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed +cd /opt/tempT/RAMspeed/ramspeed-2.6.0 mkdir temp bash build.sh diff --git a/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash b/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash index fcb655968..526d0b9f6 100644 --- a/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash @@ -21,7 +21,7 @@ OUTPUT_FILE=/tmp/ramspeed-out.log run_ramspeed() { - cd /opt/tempT2/ramspeed-2.6.0/ + cd /opt/tempT/RAMspeed/ramspeed-2.6.0/ ./ramspeed -b $TYPE_ID -g $LOAD -m $BLOCK_SIZE > $OUTPUT_FILE } diff --git a/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash b/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash index 69c2934af..931a06375 100644 --- a/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash @@ -22,7 +22,7 @@ OUTPUT_FILE=/tmp/ramspeed-out.log run_ramspeed() { - cd /opt/tempT2/ramspeed-2.6.0/ + cd /opt/tempT/RAMspeed/ramspeed-2.6.0/ ./ramspeed -b $TYPE_ID -g $LOAD -m $BLOCK_SIZE -l $ITERATION > $OUTPUT_FILE } -- cgit 1.2.3-korg