equal
deleted
inserted
replaced
62 COMPONENT_TEST_TARGETS = |
62 COMPONENT_TEST_TARGETS = |
63 |
63 |
64 # The additional conflict specific set of transforms to be applied to the |
64 # The additional conflict specific set of transforms to be applied to the |
65 # test results to try to normalize them. |
65 # test results to try to normalize them. |
66 COMPONENT_TEST_TRANSFORMS += \ |
66 COMPONENT_TEST_TRANSFORMS += \ |
67 '-e "s|/tmp/conflict\.......|/tmp/conflict\.xxxxxx|g" ' |
67 '-e "s|/tmp/conflict\.......|/tmp/conflict\.xxxxxx|g" ' \ |
|
68 '-e "s|^\*\* \$$(@D)/.*$$|XXX_CC_XXX|g" ' \ |
|
69 '-e "s|^\*\* /usr/bin/.*$$|XXX_CC_XXX|g" ' \ |
|
70 '-e "/^XXX_CC_XXX$$/d" ' |
|
71 |
|
72 COMPONENT_SYSTEM_TEST_DIR = $(BUILD_DIR_64) |
|
73 COMPONENT_SYSTEM_TEST_ENV = CONFLICT_BIN=/usr/bin/conflict |
|
74 COMPONENT_SYSTEM_TEST_CMD = ./run_test.sh |
|
75 COMPONENT_SYSTEM_TEST_TARGETS = |
68 |
76 |
69 ASLR_MODE = $(ASLR_ENABLE) |
77 ASLR_MODE = $(ASLR_ENABLE) |
70 |
78 |
71 configure: $(CONFIGURE_64) |
79 configure: $(CONFIGURE_64) |
72 |
80 |
74 |
82 |
75 install: $(INSTALL_64) |
83 install: $(INSTALL_64) |
76 |
84 |
77 test: $(TEST_64) |
85 test: $(TEST_64) |
78 |
86 |
79 system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) |
87 # We really do need to build conflict so that it can use the files in the |
|
88 # build directory. We are using the installed conflict binary to do this |
|
89 # though when we run the system tests. |
|
90 system-test: build $(SYSTEM_TEST_64) |
80 |
91 |
81 |
92 |
82 REQUIRED_PACKAGES += system/library |
93 REQUIRED_PACKAGES += system/library |