Code Review / vpp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5389a70)
hs-test: clean up Makefile for compatibility with ci-management 21/40821/2 master
authorDave Wallace <dwallacelf@gmail.com>
Thu, 25 Apr 2024 20:21:37 +0000 (16:21 -0400)
committerFlorin Coras <florin.coras@gmail.com>
Fri, 26 Apr 2024 01:48:58 +0000 (01:48 +0000)
Type: test
Change-Id: Ic767bc1eef0180941dd8730f9fcca1389ad7e043
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
.gitignore patch | blob | history
extras/hs-test/Makefile patch | blob | history
extras/hs-test/go.mod patch | blob | history
extras/hs-test/go.sum patch | blob | history

diff --git a/.gitignore b/.gitignore
index 3d2c2fc..5c707a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -122,7 +122,7 @@ compile_commands.json
 /extras/hs-test/vpp-data
 /extras/hs-test/hs-test
 /extras/hs-test/http_server
-/extras/hs-test/.build.vpp
+/extras/hs-test/.build.ok
 
 # ./configure
 /CMakeFiles
diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index 196bca5..d4e6999 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -78,30 +78,38 @@ help:
 list-tests:
        $(call list_tests)
 
+.PHONY: build-vpp-release
 build-vpp-release:
        @make -C ../.. build-release
 
+.PHONY: build-vpp-debug
 build-vpp-debug:
        @make -C ../.. build
 
+.build.ok: build
+       @touch .build.ok
+
 .PHONY: test
-test: .deps.ok .build.vpp
+test: .deps.ok .build.ok
        @bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
                --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
                --vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT)
 
+.PHONY: build-go
 build-go:
        go build ./tools/http_server
 
+.PHONY: build
 build: .deps.ok build-vpp-release build-go
-       @rm -f .build.vpp
+       @rm -f .build.ok
        bash ./script/build_hst.sh release
-       @touch .build.vpp
+       @touch .build.ok
 
+.PHONY: build-debug
 build-debug: .deps.ok build-vpp-debug build-go
-       @rm -f .build.vpp
+       @rm -f .build.ok
        bash ./script/build_hst.sh debug
-       @touch .build.vpp
+       @touch .build.ok
 
 .deps.ok:
        @sudo make install-deps
@@ -111,14 +119,13 @@ install-deps:
        @rm -f .deps.ok
        @apt-get update \
                && apt-get install -y apt-transport-https ca-certificates curl software-properties-common \
-               && apt-get install -y golang apache2-utils wrk bridge-utils
+               apache2-utils wrk bridge-utils
        @if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ] ; then \
                curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg; \
                echo "deb [arch=$(ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(UBUNTU_CODENAME) stable" \
                        | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ; \
                apt-get update; \
        fi
-       @apt-get install -y docker-ce
        @touch .deps.ok
 
 .PHONY: fixstyle
diff --git a/extras/hs-test/go.mod b/extras/hs-test/go.mod
index 50d83a4..0f3854d 100644 (file)
--- a/extras/hs-test/go.mod
+++ b/extras/hs-test/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
        github.com/edwarnicke/exechelper v1.0.3
-       go.fd.io/govpp v0.9.0
+       go.fd.io/govpp v0.10.0
        gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -24,7 +24,7 @@ require (
        github.com/kr/text v0.2.0 // indirect
        github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
        github.com/onsi/ginkgo/v2 v2.16.0
-       github.com/onsi/gomega v1.30.0
+       github.com/onsi/gomega v1.32.0
        github.com/pkg/errors v0.9.1 // indirect
        github.com/sirupsen/logrus v1.9.3 // indirect
        github.com/vishvananda/netns v0.0.4 // indirect
diff --git a/extras/hs-test/go.sum b/extras/hs-test/go.sum
index 0070725..479b028 100644 (file)
--- a/extras/hs-test/go.sum
+++ b/extras/hs-test/go.sum
@@ -13,8 +13,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
@@ -32,8 +30,8 @@ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
 github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
 github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
+github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -48,8 +46,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
-go.fd.io/govpp v0.9.0 h1:EHUXhQ+dph2K2An4YMqmd/WBE3Fcqsg97KVmdLJoSoU=
-go.fd.io/govpp v0.9.0/go.mod h1:9QoqjEbvfuuXNfjHS0A7YS+7QQVVaQ9cMioOWpSM4rY=
+go.fd.io/govpp v0.10.0 h1:lL93SbqOILjON2pMvazrlHRekGYTRy0Qmj57RuAkxR0=
+go.fd.io/govpp v0.10.0/go.mod h1:5m3bZM9ck+2EGC2O3ASmSSJAaoouyOlVWtiwj5BdCv0=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -61,8 +59,8 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
 golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Vector Packet Processing