Nir Soffer has uploaded a new change for review.
Change subject: build: Use make for generating the test certificates ......................................................................
build: Use make for generating the test certificates
It is easier to use make for creating files during the build instead of reimplementing it in a shell script.
Change-Id: I543e306deff394fd61b72152b758fc4572b4da86 Signed-off-by: Nir Soffer nsoffer@redhat.com --- M tests/Makefile.am M tests/run_tests_local.sh.in 2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/48226/1
diff --git a/tests/Makefile.am b/tests/Makefile.am index 61877de..eab7dc7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -216,7 +216,7 @@ all-local: \ $(nodist_vdsmtests_PYTHON)
-server.crt: +server.crt server.csr server.key other.crt other.csr other.key: ./makecert.sh
# crossImportsTests.py has to be run separate due to different tests which diff --git a/tests/run_tests_local.sh.in b/tests/run_tests_local.sh.in index d19f22c..faf4412 100644 --- a/tests/run_tests_local.sh.in +++ b/tests/run_tests_local.sh.in @@ -3,8 +3,4 @@ PYTHON_EXE="@PYTHON@" fi
-if [ ! -f @top_srcdir@/tests/server.crt ] || [ ! -f @top_srcdir@/tests/server.csr ] || [ ! -f @top_srcdir@/tests/server.key ] || [ ! -f @top_srcdir@/tests/other.crt ] || [ ! -f @top_srcdir@/tests/other.csr ] || [ ! -f @top_srcdir@/tests/other.key ]; then - @top_srcdir@/tests/makecert.sh -fi - PYTHONDONTWRITEBYTECODE=1 LC_ALL=C PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH" "$PYTHON_EXE" @top_srcdir@/tests/testrunner.py --local-modules $@
automation@ovirt.org has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 1:
* Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Nir Soffer has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 1: Verified+1
Dan Kenigsberg has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 1: Code-Review+1
I have no recollection of why the test was done in shell.
Piotr Kliczewski has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 1: Code-Review+1
Dan Kenigsberg has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 1: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: build: Use make for generating the test certificates ......................................................................
build: Use make for generating the test certificates
It is easier to use make for creating files during the build instead of reimplementing it in a shell script.
Change-Id: I543e306deff394fd61b72152b758fc4572b4da86 Signed-off-by: Nir Soffer nsoffer@redhat.com Reviewed-on: https://gerrit.ovirt.org/48226 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski piotr.kliczewski@gmail.com Reviewed-by: Dan Kenigsberg danken@redhat.com --- M tests/Makefile.am M tests/run_tests_local.sh.in 2 files changed, 1 insertion(+), 5 deletions(-)
Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Nir Soffer: Verified Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved
automation@ovirt.org has posted comments on this change.
Change subject: build: Use make for generating the test certificates ......................................................................
Patch Set 2:
* Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found.
vdsm-patches@lists.fedorahosted.org