Skip to content

Commit 310dee6

Browse files
authored
Fix execution of the e2e tests 033 & 034 (#779)
1 parent 73c6d1d commit 310dee6

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ e2e_032: $(PHP_SCOPER_PHAR_BIN)
441441

442442
.PHONY: e2e_033
443443
e2e_033: ## Runs end-to-end tests for the fixture set 033 — Scoping of a codebase a function registered in the global namespace
444-
e2e_033: $(PHP_SCOPER_PHAR_BIN)
444+
e2e_033: $(PHP_SCOPER_PHAR_BIN) fixtures/set033-user-global-function/vendor
445445
$(PHP_SCOPER_PHAR) add-prefix \
446446
--working-dir=fixtures/set033-user-global-function \
447447
--output-dir=../../build/set033-user-global-function \
@@ -458,7 +458,7 @@ e2e_033: $(PHP_SCOPER_PHAR_BIN)
458458

459459
.PHONY: e2e_034
460460
e2e_034: ## Runs end-to-end tests for the fixture set 034 — Leverage Composer InstalledVersions
461-
e2e_034: $(PHP_SCOPER_PHAR_BIN)
461+
e2e_034: $(PHP_SCOPER_PHAR_BIN) fixtures/set034-installed-versions/vendor
462462
$(PHP_SCOPER_PHAR) add-prefix \
463463
--working-dir=fixtures/set034-installed-versions \
464464
--output-dir=../../build/set034-installed-versions \
@@ -653,3 +653,17 @@ fixtures/set029-easy-rdf/composer.lock: fixtures/set029-easy-rdf/composer.json
653653
fixtures/set030/vendor: fixtures/set030/composer.json
654654
composer --working-dir=fixtures/set030 install --no-dev
655655
touch -c $@
656+
657+
fixtures/set033-user-global-function/vendor: fixtures/set033-user-global-function/composer.lock
658+
composer --working-dir=fixtures/set033-user-global-function install --no-dev --no-scripts
659+
touch -c $@
660+
fixtures/set033-user-global-function/composer.lock: fixtures/set033-user-global-function/composer.json
661+
@echo "$(@) is not up to date. You may want to run the following command:"
662+
@echo "$$ composer --working-dir=fixtures/set033-user-global-function update --lock && touch -c $(@)"
663+
664+
fixtures/set034-installed-versions/vendor: fixtures/set034-installed-versions/composer.lock
665+
composer --working-dir=fixtures/set034-installed-versions install --no-dev --no-scripts
666+
touch -c $@
667+
fixtures/set034-installed-versions/composer.lock: fixtures/set034-installed-versions/composer.json
668+
@echo "$(@) is not up to date. You may want to run the following command:"
669+
@echo "$$ composer --working-dir=fixtures/set034-installed-versions update --lock && touch -c $(@)"

0 commit comments

Comments
 (0)