mirror of
https://github.com/corda/corda.git
synced 2025-01-04 04:04:27 +00:00
build but don't run extra tests in makefile
This commit is contained in:
parent
ecfecf2006
commit
e35047b056
16
makefile
16
makefile
@ -299,10 +299,15 @@ classpath-classes = \
|
|||||||
classpath-object = $(native-build)/classpath-jar.o
|
classpath-object = $(native-build)/classpath-jar.o
|
||||||
classpath-dep = $(classpath-build)/dep
|
classpath-dep = $(classpath-build)/dep
|
||||||
|
|
||||||
test-sources = $(shell find $(test) -name '*.java')
|
test-sources = $(wildcard $(test)/*.java)
|
||||||
test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))
|
test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))
|
||||||
test-dep = $(test-build)/dep
|
test-dep = $(test-build)/dep
|
||||||
|
|
||||||
|
test-extra-sources = $(wildcard $(test)/extra/*.java)
|
||||||
|
test-extra-classes = \
|
||||||
|
$(call java-classes,$(test-extra-sources),$(test),$(test-build))
|
||||||
|
test-extra-dep = $(test-build)/extra/dep
|
||||||
|
|
||||||
class-name = $(patsubst $(1)/%.class,%,$(2))
|
class-name = $(patsubst $(1)/%.class,%,$(2))
|
||||||
class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
|
class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
|
||||||
|
|
||||||
@ -312,7 +317,7 @@ args = $(flags) $(input)
|
|||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
build: $(static-library) $(executable) $(dynamic-library) \
|
build: $(static-library) $(executable) $(dynamic-library) \
|
||||||
$(executable-dynamic) $(classpath-dep) $(test-dep)
|
$(executable-dynamic) $(classpath-dep) $(test-dep) $(test-extra-dep)
|
||||||
|
|
||||||
$(test-classes): $(classpath-dep)
|
$(test-classes): $(classpath-dep)
|
||||||
|
|
||||||
@ -390,6 +395,13 @@ $(test-dep): $(test-sources)
|
|||||||
test/Subroutine.java
|
test/Subroutine.java
|
||||||
@touch $(@)
|
@touch $(@)
|
||||||
|
|
||||||
|
$(test-extra-dep): $(test-extra-sources)
|
||||||
|
@echo "compiling extra test classes"
|
||||||
|
@mkdir -p $(dir $(@))
|
||||||
|
$(javac) -d $(test) -bootclasspath $(classpath-build) \
|
||||||
|
$(shell $(MAKE) -s --no-print-directory $(test-extra-classes))
|
||||||
|
@touch $(@)
|
||||||
|
|
||||||
define compile-object
|
define compile-object
|
||||||
@echo "compiling $(@)"
|
@echo "compiling $(@)"
|
||||||
@mkdir -p $(dir $(@))
|
@mkdir -p $(dir $(@))
|
||||||
|
Loading…
Reference in New Issue
Block a user