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 2a3023c..2d982d0 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 9e1d2cf..6c4aae0 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 4be7c92..7899f6d 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 6ad4513..ad1cbb2 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 569fbfe..a7c9d31 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 960eba7..12eafd6 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