components/junit/Makefile
changeset 4700 3e0131debf7c
parent 4339 6501cf9c29f9
child 5146 c60fe986692f
equal deleted inserted replaced
4699:e05387dee068 4700:3e0131debf7c
    41 # These ARGS override what is set in build.xml
    41 # These ARGS override what is set in build.xml
    42 COMPONENT_BUILD_ARGS 	+= -Ddist=${PROTO_DIR}
    42 COMPONENT_BUILD_ARGS 	+= -Ddist=${PROTO_DIR}
    43 COMPONENT_BUILD_ARGS    += -Djavadocdir=${PROTO_DIR}
    43 COMPONENT_BUILD_ARGS    += -Djavadocdir=${PROTO_DIR}
    44 COMPONENT_BUILD_ARGS    += -Dversion-status=""
    44 COMPONENT_BUILD_ARGS    += -Dversion-status=""
    45 COMPONENT_BUILD_ARGS    += -Dadditionalparam="-Xdoclint:none"
    45 COMPONENT_BUILD_ARGS    += -Dadditionalparam="-Xdoclint:none"
    46 COMPONENT_BUILD_TARGETS += dist
    46 COMPONENT_BUILD_TARGETS  = populate-dist
       
    47 
       
    48 # We patched in test-build into build.xml which is a copy of
       
    49 # dist but without the depends=populate-dist
       
    50 # because userland infrasture will handle the build and we
       
    51 # need to build tests which are also part of the overall softare build.
       
    52 COMPONENT_TEST_ARGS	+= $(COMPONENT_BUILD_ARGS)
       
    53 COMPONENT_TEST_TARGETS	 = test-build
       
    54 
       
    55 COMPONENT_SYSTEM_TEST_ARGS	+= -Dsystem-binjar=/usr/share/lib/java/$(COMPONENT_NAME).jar
       
    56 COMPONENT_SYSTEM_TEST_TARGETS	 = test
       
    57 
       
    58 # Test transforms
       
    59 # 	remove everything upto "test" which is build noise
       
    60 #	remove time
       
    61 COMPONENT_TEST_TRANSFORMS += \
       
    62 	'-e "1,/^test/d"' \
       
    63 	'-e "s/.*[Tt]ime.*$$//"'
    47 
    64 
    48 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
    65 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
    49 
    66 
    50 build:		$(BUILD_32)
    67 build:		$(BUILD_32)
    51 	
    68 	
    52 install:	build	
    69 install:	build	
    53 
    70 
    54 # Testing is run as part of the build.
    71 # Another test is:
    55 # To really test AFTER you have installed the resulting package do:
    72 # To test after you have installed the resulting package do:
    56 # $ java -cp /usr/share/lib/java/junit.jar:/usr/share/doc/junit/samples/org \
    73 # $ java -cp /usr/share/lib/java/junit.jar:/usr/share/doc/junit/samples/org \
    57 #       junit/samples/money/MoneyTest
    74 #       junit/samples/money/MoneyTest
    58 # ......................
    75 # ......................
    59 # Time: 0.003
    76 # Time: 0.003
    60 #
    77 #
    61 # OK (22 tests)
    78 # OK (22 tests)
    62 test:		$(NO_TESTS)
       
    63 
    79 
    64 system-test:    $(NO_TESTS)
    80 test:		$(TEST_32)
       
    81 
       
    82 system-test:    build $(SYSTEM_TEST_32)
    65 		
    83 		
    66 REQUIRED_PACKAGES += runtime/java/jre-8
    84 REQUIRED_PACKAGES += runtime/java/jre-8