testing: Make TKM related build recipes future-proof

The tkm scenarios recently failed due to a segmentation fault on my host
because I had an old build of the tkm library already built in the build
directory.  Because the stamp file was not versioned the new release was
never checked out or built and charon-tkm was linked against the old
version causing a segmentation fault during key derivation.

diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
index 2a3023c42d85d252482c57597d5d06f5e89a7d7c..2d982d091964d5640760ed85180de589f75865c9 100644 (file)
--- a/testing/scripts/recipes/005_anet.mk
+++ b/testing/scripts/recipes/005_anet.mk
@@ -8,14 +8,16 @@ PREFIX = /usr/local/ada
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make LIBRARY_KIND=static
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) LIBRARY_KIND=static install

diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
index 9e1d2cfc690d6c2f8020e32c4ce5c2be33c0f94f..6c4aae0c51eafcbac802f41a26d38f5138c7f4dc 100644 (file)
--- a/testing/scripts/recipes/006_tkm-rpc.mk
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/007_x509-ada.mk b/testing/scripts/recipes/007_x509-ada.mk
index 4be7c92e4a67405f0f8653fe58ac238d86dd5786..7899f6dec67eafce0615c4f8c64a480df3989af8 100644 (file)
--- a/testing/scripts/recipes/007_x509-ada.mk
+++ b/testing/scripts/recipes/007_x509-ada.mk
@@ -8,14 +8,16 @@ PREFIX = /usr/local/ada
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make tests && make
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/008_xfrm-ada.mk b/testing/scripts/recipes/008_xfrm-ada.mk
index 6ad451340a42991b9d01962138c3b88190caed00..ad1cbb2bc7b07d86503db64818650c28725e91af 100644 (file)
--- a/testing/scripts/recipes/008_xfrm-ada.mk
+++ b/testing/scripts/recipes/008_xfrm-ada.mk
@@ -10,14 +10,16 @@ export ADA_PROJECT_PATH=$(PREFIX)/lib/gnat
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make PREFIX=$(PREFIX) install

diff --git a/testing/scripts/recipes/009_xfrm-proxy.mk b/testing/scripts/recipes/009_xfrm-proxy.mk
index 569fbfe3c54a9b07a1af717bd17ad3f4f36f271a..a7c9d31cc2f5c4859ecbef2a6142882fcac07b7e 100644 (file)
--- a/testing/scripts/recipes/009_xfrm-proxy.mk
+++ b/testing/scripts/recipes/009_xfrm-proxy.mk
@@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make install

diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index 960eba79fc706d37c5ed25237df86e91c5ac3317..12eafd6c872ca85448c1e3cd22faaeceaccc84c6 100644 (file)
--- a/testing/scripts/recipes/010_tkm.mk
+++ b/testing/scripts/recipes/010_tkm.mk
@@ -8,14 +8,16 @@ export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
 
 all: install
 
-.$(PKG)-cloned:
+$(PKG):
        git clone $(SRC) $(PKG)
-       cd $(PKG) && git checkout $(REV)
+
+.$(PKG)-cloned-$(REV): $(PKG)
+       cd $(PKG) && git fetch && git checkout $(REV)
        @touch $@
 
-.$(PKG)-built: .$(PKG)-cloned
+.$(PKG)-built-$(REV): .$(PKG)-cloned-$(REV)
        cd $(PKG) && make
        @touch $@
 
-install: .$(PKG)-built
+install: .$(PKG)-built-$(REV)
        cd $(PKG) && make install