Skip to contentSkip to conversation

tests/docker: fix typo for debian9-mxe

PATCH In review John Snow 3 participants 4 messages Sep 17, 2019 – Sep 18, 2019

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 tests/docker: fix typo for debian9-mxe

We spelled it debian-9-mxe, but the image is debian9-mxe.

---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/Makefile.include +1 -1
index 50a400b573..7eac1516f6 100644
@@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
 DOCKER_DEPRECATED_IMAGES := debian
 # we don't run tests on intermediate images (used as base by another image)
 DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid
-DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap
+DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
 DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
Signature · 1 line
2.21.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · John Snow

We spelled it debian-9-mxe, but the image is debian9-mxe.

Oops I missed that, good catch.

Quoted 19 lines
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/Makefile.include +1 -1
index 50a400b573..7eac1516f6 100644
@@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
 DOCKER_DEPRECATED_IMAGES := debian
 # we don't run tests on intermediate images (used as base by another image)
 DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid
-DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap
+DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
 DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
#2 lore raw
In reply to John Snow
Quoted 3 lines · John Snow

We spelled it debian-9-mxe, but the image is debian9-mxe.

I'll merge this fix with the other typo fix while I'm at it. Thanks.

Quoted 9 lines
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/Makefile.include +0 -0
index 50a400b573..7eac1516f6 100644

tests/docker/Makefile.include DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles · line 13

Quoted 8 lines
tests/docker/Makefile.include +1 -1
@@ -7,7 +7,7 @@ DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
 DOCKER_DEPRECATED_IMAGES := debian
 # we don't run tests on intermediate images (used as base by another image)
 DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian-sid
-DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-mxe debian-ports debian-bootstrap
+DEBIAN_PARTIAL_IMAGES += debian8-mxe debian9-mxe debian-ports debian-bootstrap
 DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds

--
Alex Bennée

author
#3 lore raw
Quoted 9 lines · Alex Bennée
Quoted 3 lines · John Snow

We spelled it debian-9-mxe, but the image is debian9-mxe.

I'll merge this fix with the other typo fix while I'm at it. Thanks.

ACK

thanks!