[PATCH openbmc-test-automation 42/60] fixed errors in tox and generate_argumentfile.sh script

OpenBMC Patches openbmc-patches at stwcx.xyz
Tue Jan 12 03:50:08 AEDT 2016


From: Manjunath A Kumatagi <mkumatag at in.ibm.com>

---
 .gitignore                     | 1 +
 tools/generate_argumentfile.sh | 2 +-
 tox.ini                        | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8aea548..eb901c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.pyc
 /log.html
 /output.xml
 /report.html
diff --git a/tools/generate_argumentfile.sh b/tools/generate_argumentfile.sh
index 518a48f..4869261 100755
--- a/tools/generate_argumentfile.sh
+++ b/tools/generate_argumentfile.sh
@@ -2,4 +2,4 @@
 
 echo "--variable OPENBMC_HOST:$OPENBMC_HOST" > $ARG_FILE
 echo "--variable OPENBMC_USERNAME:$OPENBMC_USERNAME" >> $ARG_FILE
-echo "--variable OPENBMC_HOST:$OPENBMC_HOST" >> $ARG_FILE
+echo "--variable OPENBMC_PASSWORD:$OPENBMC_PASSWORD" >> $ARG_FILE
diff --git a/tox.ini b/tox.ini
index 75ab527..fa0d198 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,14 @@ whitelist_externals = *
 install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
 commands =
+    bash {toxinidir}/tools/generate_argumentfile.sh
     python -m robot.run --argumentfile {env:ARG_FILE:/tmp/argument_file.txt} {posargs}
 
 [testenv:full]
 deps = {[testenv]deps}
 setenv = {[testenv]setenv}
 commands =
+    bash {toxinidir}/tools/generate_argumentfile.sh
     python -m robot.run --argumentfile {env:ARG_FILE:/tmp/argument_file.txt} .
 
 [testenv:tests]
@@ -27,4 +29,5 @@ commands =
 deps = {[testenv]deps}
 setenv = {[testenv]setenv}
 commands =
+    bash {toxinidir}/tools/generate_argumentfile.sh
     python -m robot.run --argumentfile {env:ARG_FILE:/tmp/argument_file.txt} {posargs}
\ No newline at end of file
-- 
2.6.4




More information about the openbmc mailing list