Andrew Jones <drjo...@redhat.com> writes: > On Fri, Feb 26, 2016 at 01:15:23PM +0000, Alex Bennée wrote: >> This is a source of needless conflicts when adding new tests and >> re-basing. Let's just build up the lists of tests by hand. >> >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> >> --- >> config/config-arm-common.mak | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/config/config-arm-common.mak b/config/config-arm-common.mak >> index 698555d..e037507 100644 >> --- a/config/config-arm-common.mak >> +++ b/config/config-arm-common.mak >> @@ -9,9 +9,8 @@ ifeq ($(LOADADDR),) >> LOADADDR = 0x40000000 >> endif >> >> -tests-common = \ >> - $(TEST_DIR)/selftest.flat \ >> - $(TEST_DIR)/spinlock-test.flat >> +tests-common = $(TEST_DIR)/selftest.flat >> +tests-common += $(TEST_DIR)/spinlock-test.flat >> >> all: test_cases >> >> -- >> 2.7.1 >> >> > > I agree with this patch, but we could probably just squash it > with the addition of the next test.
It was originally but during yet-another-rebase I thought I'd just separate the patch so it wasn't dependant on what was merged next! > > drew -- Alex Bennée
