Skip to contentSkip to conversation

tests/vm: remove unused --target-list option

PATCH In review John Snow 2 participants 5 messages Sep 17, 2019

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 tests/vm: remove unused --target-list option

It's not used; so remove the distraction.

---
 tests/vm/Makefile.include | 2 --
 1 file changed, 2 deletions(-)
tests/vm/Makefile.include +0 -2
index fea348e845..61758101fa 100644
@@ -28,7 +28,6 @@ vm-help vm-test:
 	@echo
 	@echo "Special variables:"
 	@echo "    BUILD_TARGET=foo		 - Override the build target"
-	@echo "    TARGET_LIST=a,b,c    	 - Override target list in builds"
 	@echo '    EXTRA_CONFIGURE_OPTS="..."'
 	@echo "    J=[0..9]*            	 - Override the -jN parameter for make commands"
 	@echo "    DEBUG=1              	 - Enable verbose output on host and interactive debugging"
@@ -65,7 +64,6 @@ vm-build-%: $(IMAGES_DIR)/%.img
 		$(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
 		--snapshot \
 		--build-qemu $(SRC_PATH) -- \
-		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
 		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
 		"  VM-BUILD $*")
 
Signature · 1 line
2.21.0
#1 lore raw
Quoted 1 line · John Snow

It's not used; so remove the distraction.

It's a developer feature so you can run specific builds against the VM images. I certainly have used it, unless you are saying it's broken now?

Quoted 19 lines
---
 tests/vm/Makefile.include | 2 --
 1 file changed, 2 deletions(-)
tests/vm/Makefile.include +0 -1
index fea348e845..61758101fa 100644
@@ -28,7 +28,6 @@ vm-help vm-test:
 	@echo
 	@echo "Special variables:"
 	@echo "    BUILD_TARGET=foo		 - Override the build target"
-	@echo "    TARGET_LIST=a,b,c    	 - Override target list in builds"
 	@echo '    EXTRA_CONFIGURE_OPTS="..."'
 	@echo "    J=[0..9]*            	 - Override the -jN parameter for make commands"
 	@echo "    DEBUG=1              	 - Enable verbose output on host and interactive debugging"

tests/vm/Makefile.include vm-build-%: $(IMAGES_DIR)/%.img · line 68

Quoted 6 lines
tests/vm/Makefile.include +0 -1
@@ -65,7 +64,6 @@ vm-build-%: $(IMAGES_DIR)/%.img
 		$(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
 		--snapshot \
 		--build-qemu $(SRC_PATH) -- \
-		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
 		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
 		"  VM-BUILD $*")

--
Alex Bennée

author
#2 lore raw
Quoted 8 lines · Alex Bennée
Quoted 1 line · John Snow

It's not used; so remove the distraction.

It's a developer feature so you can run specific builds against the VM images. I certainly have used it, unless you are saying it's broken now?

What consumes it? I can't find where it *does* something:

jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep TARGET_LIST
Makefile.include: @echo " TARGET_LIST=a,b,c -
Override target list in builds"
Makefile.include: $(if
$(TARGET_LIST),--target-list=$(TARGET_LIST)) \
jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep target-list
Makefile.include: $(if
$(TARGET_LIST),--target-list=$(TARGET_LIST)) \
jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep target_list jhuston@probe ~/s/q/t/vm (docker-partial-fixup) [1]>

the VM script doesn't seem to pick it up or apply defaults, so I don't know where this was supposed to be routed to.

Quoted 27 lines
Quoted 25 lines
---
 tests/vm/Makefile.include | 2 --
 1 file changed, 2 deletions(-)
tests/vm/Makefile.include +0 -2
index fea348e845..61758101fa 100644
@@ -28,7 +28,6 @@ vm-help vm-test:
 	@echo
 	@echo "Special variables:"
 	@echo "    BUILD_TARGET=foo		 - Override the build target"
-	@echo "    TARGET_LIST=a,b,c    	 - Override target list in builds"
 	@echo '    EXTRA_CONFIGURE_OPTS="..."'
 	@echo "    J=[0..9]*            	 - Override the -jN parameter for make commands"
 	@echo "    DEBUG=1              	 - Enable verbose output on host and interactive debugging"
@@ -65,7 +64,6 @@ vm-build-%: $(IMAGES_DIR)/%.img
 		$(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
 		--snapshot \
 		--build-qemu $(SRC_PATH) -- \
-		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
 		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
 		"  VM-BUILD $*")
#3 lore raw
Quoted 11 lines · John Snow
Quoted 8 lines · Alex Bennée
Quoted 1 line · John Snow

It's not used; so remove the distraction.

It's a developer feature so you can run specific builds against the VM images. I certainly have used it, unless you are saying it's broken now?

What consumes it? I can't find where it *does* something:

It's past as the rest:

                -- \ <- all args after this
		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \

Become argv in:

args, argv = parse_args(vmcls)
...
cmd = [vm.BUILD_SCRIPT.format(
configure_opts = " ".join(argv), jobs=int(args.jobs), target=args.build_target, verbose = "V=1" if args.verbose else "")]

Quoted 13 lines

jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep TARGET_LIST
Makefile.include: @echo " TARGET_LIST=a,b,c -
Override target list in builds"
Makefile.include: $(if
$(TARGET_LIST),--target-list=$(TARGET_LIST)) \
jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep target-list
Makefile.include: $(if
$(TARGET_LIST),--target-list=$(TARGET_LIST)) \
jhuston@probe ~/s/q/t/vm (docker-partial-fixup)> git grep target_list jhuston@probe ~/s/q/t/vm (docker-partial-fixup) [1]>

Quoted 31 lines

the VM script doesn't seem to pick it up or apply defaults, so I don't know where this was supposed to be routed to.

Quoted 27 lines
Quoted 25 lines
---
 tests/vm/Makefile.include | 2 --
 1 file changed, 2 deletions(-)
tests/vm/Makefile.include +0 -2
index fea348e845..61758101fa 100644
@@ -28,7 +28,6 @@ vm-help vm-test:
 	@echo
 	@echo "Special variables:"
 	@echo "    BUILD_TARGET=foo		 - Override the build target"
-	@echo "    TARGET_LIST=a,b,c    	 - Override target list in builds"
 	@echo '    EXTRA_CONFIGURE_OPTS="..."'
 	@echo "    J=[0..9]*            	 - Override the -jN parameter for make commands"
 	@echo "    DEBUG=1              	 - Enable verbose output on host and interactive debugging"
@@ -65,7 +64,6 @@ vm-build-%: $(IMAGES_DIR)/%.img
 		$(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
 		--snapshot \
 		--build-qemu $(SRC_PATH) -- \
-		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
 		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
 		"  VM-BUILD $*")

--
Alex Bennée

author NAK
#4 lore raw
Quoted 23 lines · Alex Bennée
Quoted 11 lines · John Snow
Quoted 8 lines · Alex Bennée
Quoted 1 line · John Snow

It's not used; so remove the distraction.

It's a developer feature so you can run specific builds against the VM images. I certainly have used it, unless you are saying it's broken now?

What consumes it? I can't find where it *does* something:

It's past as the rest:

                -- \ <- all args after this
		$(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
		$(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \

Become argv in:

Quoted 8 lines

args, argv = parse_args(vmcls)
...
cmd = [vm.BUILD_SCRIPT.format(
configure_opts = " ".join(argv), jobs=int(args.jobs), target=args.build_target, verbose = "V=1" if args.verbose else "")]

augh, optparse ... okay, I goofed. I didn't realize they come back unparsed. So they become configure options specifically, OK, got it.

Disregard, sorry!

NACK

--js