put ${CURDIR} in quotes to prevent make from splitting paths with spaces into separate strings (#14056)
This commit is contained in:
		
							parent
							
								
									4cd94e3689
								
							
						
					
					
						commit
						4ef751215c
					
				
							
								
								
									
										42
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								Makefile
									
									
									
									
									
								
							| @ -389,15 +389,15 @@ generate-ini-sqlite: | |||||||
| 
 | 
 | ||||||
| .PHONY: test-sqlite | .PHONY: test-sqlite | ||||||
| test-sqlite: integrations.sqlite.test generate-ini-sqlite | test-sqlite: integrations.sqlite.test generate-ini-sqlite | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test | ||||||
| 
 | 
 | ||||||
| .PHONY: test-sqlite\#%
 | .PHONY: test-sqlite\#%
 | ||||||
| test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite | test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*) | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*) | ||||||
| 
 | 
 | ||||||
| .PHONY: test-sqlite-migration | .PHONY: test-sqlite-migration | ||||||
| test-sqlite-migration:  migrations.sqlite.test generate-ini-sqlite | test-sqlite-migration:  migrations.sqlite.test generate-ini-sqlite | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test | ||||||
| 
 | 
 | ||||||
| generate-ini-mysql: | generate-ini-mysql: | ||||||
| 	sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
 | 	sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
 | ||||||
| @ -409,15 +409,15 @@ generate-ini-mysql: | |||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql | .PHONY: test-mysql | ||||||
| test-mysql: integrations.mysql.test generate-ini-mysql | test-mysql: integrations.mysql.test generate-ini-mysql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql\#%
 | .PHONY: test-mysql\#%
 | ||||||
| test-mysql\#%: integrations.mysql.test generate-ini-mysql | test-mysql\#%: integrations.mysql.test generate-ini-mysql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*) | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*) | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql-migration | .PHONY: test-mysql-migration | ||||||
| test-mysql-migration: migrations.mysql.test generate-ini-mysql | test-mysql-migration: migrations.mysql.test generate-ini-mysql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test | ||||||
| 
 | 
 | ||||||
| generate-ini-mysql8: | generate-ini-mysql8: | ||||||
| 	sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
 | 	sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
 | ||||||
| @ -429,15 +429,15 @@ generate-ini-mysql8: | |||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql8 | .PHONY: test-mysql8 | ||||||
| test-mysql8: integrations.mysql8.test generate-ini-mysql8 | test-mysql8: integrations.mysql8.test generate-ini-mysql8 | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql8\#%
 | .PHONY: test-mysql8\#%
 | ||||||
| test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8 | test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8 | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*) | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*) | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mysql8-migration | .PHONY: test-mysql8-migration | ||||||
| test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8 | test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8 | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test | ||||||
| 
 | 
 | ||||||
| generate-ini-pgsql: | generate-ini-pgsql: | ||||||
| 	sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
 | 	sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
 | ||||||
| @ -450,15 +450,15 @@ generate-ini-pgsql: | |||||||
| 
 | 
 | ||||||
| .PHONY: test-pgsql | .PHONY: test-pgsql | ||||||
| test-pgsql: integrations.pgsql.test generate-ini-pgsql | test-pgsql: integrations.pgsql.test generate-ini-pgsql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test | ||||||
| 
 | 
 | ||||||
| .PHONY: test-pgsql\#%
 | .PHONY: test-pgsql\#%
 | ||||||
| test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql | test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*) | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*) | ||||||
| 
 | 
 | ||||||
| .PHONY: test-pgsql-migration | .PHONY: test-pgsql-migration | ||||||
| test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql | test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test | ||||||
| 
 | 
 | ||||||
| generate-ini-mssql: | generate-ini-mssql: | ||||||
| 	sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
 | 	sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
 | ||||||
| @ -470,35 +470,35 @@ generate-ini-mssql: | |||||||
| 
 | 
 | ||||||
| .PHONY: test-mssql | .PHONY: test-mssql | ||||||
| test-mssql: integrations.mssql.test generate-ini-mssql | test-mssql: integrations.mssql.test generate-ini-mssql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mssql\#%
 | .PHONY: test-mssql\#%
 | ||||||
| test-mssql\#%: integrations.mssql.test generate-ini-mssql | test-mssql\#%: integrations.mssql.test generate-ini-mssql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*) | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*) | ||||||
| 
 | 
 | ||||||
| .PHONY: test-mssql-migration | .PHONY: test-mssql-migration | ||||||
| test-mssql-migration: migrations.mssql.test generate-ini-mssql | test-mssql-migration: migrations.mssql.test generate-ini-mssql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast | ||||||
| 
 | 
 | ||||||
| .PHONY: bench-sqlite | .PHONY: bench-sqlite | ||||||
| bench-sqlite: integrations.sqlite.test generate-ini-sqlite | bench-sqlite: integrations.sqlite.test generate-ini-sqlite | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | ||||||
| 
 | 
 | ||||||
| .PHONY: bench-mysql | .PHONY: bench-mysql | ||||||
| bench-mysql: integrations.mysql.test generate-ini-mysql | bench-mysql: integrations.mysql.test generate-ini-mysql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | ||||||
| 
 | 
 | ||||||
| .PHONY: bench-mssql | .PHONY: bench-mssql | ||||||
| bench-mssql: integrations.mssql.test generate-ini-mssql | bench-mssql: integrations.mssql.test generate-ini-mssql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | ||||||
| 
 | 
 | ||||||
| .PHONY: bench-pgsql | .PHONY: bench-pgsql | ||||||
| bench-pgsql: integrations.pgsql.test generate-ini-pgsql | bench-pgsql: integrations.pgsql.test generate-ini-pgsql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench . | ||||||
| 
 | 
 | ||||||
| .PHONY: integration-test-coverage | .PHONY: integration-test-coverage | ||||||
| integration-test-coverage: integrations.cover.test generate-ini-mysql | integration-test-coverage: integrations.cover.test generate-ini-mysql | ||||||
| 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out | 	GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out | ||||||
| 
 | 
 | ||||||
| integrations.mysql.test: git-check $(GO_SOURCES) | integrations.mysql.test: git-check $(GO_SOURCES) | ||||||
| 	$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test | 	$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test | ||||||
| @ -720,7 +720,7 @@ docker: | |||||||
| 
 | 
 | ||||||
| .PHONY: docker-build | .PHONY: docker-build | ||||||
| docker-build: | docker-build: | ||||||
| 	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build | 	docker run -ti --rm -v "$(CURDIR):/srv/app/src/code.gitea.io/gitea" -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build | ||||||
| 
 | 
 | ||||||
| # This endif closes the if at the top of the file
 | # This endif closes the if at the top of the file
 | ||||||
| endif | endif | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user