Tomas Golembiovsky has uploaded a new change for review.

Change subject: tests: Prevent multiple invocations of makecerts.sh
......................................................................

tests: Prevent multiple invocations of makecerts.sh

Wrapped the invocation of `makecerts.sh` in special rule to prevent
multiple concurrent invocations of the script when make is running with
multiple jobs (-j).

Also there was no rule to build `server.p12` because it was missing from
`makecerts.sh` targets in the build rule. To fix this and improve the
readability all files are specified only on one place in a variable.

Change-Id: I5553057e0c0a66ccb96aa099a6608002f42d513f
Signed-off-by: Tomáš Golembiovský <[email protected]>
---
M tests/Makefile.am
1 file changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/57344/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 45f16bf..2e35f86 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -185,14 +185,20 @@
        makecert.sh \
        $(NULL)
 
-dist_noinst_DATA = \
+server_certificates = \
        server.crt \
        server.csr \
        server.key \
-       server.p12 \
+       server.p12
+
+other_certificates = \
        other.crt \
        other.csr \
-       other.key \
+       other.key
+
+dist_noinst_DATA = \
+       $(server_certificates) \
+       $(other_certificates) \
        run_tests_local.sh
 
 dist_vdsmtests_DATA = \
@@ -261,7 +267,10 @@
 all-local: \
        $(nodist_vdsmtests_PYTHON)
 
-server.crt server.csr server.key other.crt other.csr other.key: makecert.sh
+$(server_certificates) $(other_certificates): make_certificates
+
+.PHONY: make_certificates
+make_certificates: makecert.sh
        ./makecert.sh
 
 run_modules  = $(test_modules)


-- 
To view, visit https://gerrit.ovirt.org/57344
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5553057e0c0a66ccb96aa099a6608002f42d513f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tomas Golembiovsky <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to