summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2016-05-04 13:59:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-04 13:59:42 +0000
commit89864cbc856cd5cf3369429d64465615097be604 (patch)
tree2cc78b4036aaf2d2e6ba1c944a5416d402007107
parent6c888fd41de8889891c163d4757099aec84b34d8 (diff)
parent9bfdb9f76d95cc0d9e8266f85e244f0fac8f069d (diff)
Merge "bugfix: Fix creation of vsperfenv in Ubuntu"
-rwxr-xr-xsystems/ubuntu/14.04/prepare_python_env.sh4
-rw-r--r--tools/hugepages.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/systems/ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh
index f9c2def8..6ef8680d 100755
--- a/systems/ubuntu/14.04/prepare_python_env.sh
+++ b/systems/ubuntu/14.04/prepare_python_env.sh
@@ -23,7 +23,7 @@ fi
# enable virtual environment in a subshell, so QEMU build can use python 2.7
-(virtualenv-3.4 "$VSPERFENV_DIR"
+(virtualenv "$VSPERFENV_DIR"
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint) \ No newline at end of file
+pip install pylint)
diff --git a/tools/hugepages.py b/tools/hugepages.py
index 71535922..3a434d6e 100644
--- a/tools/hugepages.py
+++ b/tools/hugepages.py
@@ -78,7 +78,8 @@ def mount_hugepages():
return
if not os.path.exists(settings.getValue('HUGEPAGE_DIR')):
- os.makedirs(settings.getValue('HUGEPAGE_DIR'))
+ tasks.run_task(['sudo', 'mkdir', settings.getValue('HUGEPAGE_DIR')], _LOGGER,
+ 'Creating directory ' + settings.getValue('HUGEPAGE_DIR'), True)
try:
tasks.run_task(['sudo', 'mount', '-t', 'hugetlbfs', 'nodev',
settings.getValue('HUGEPAGE_DIR')],