Fix to also use CMAKE_BUILDIR when test is run through 'make run' to allow parallel execution

Author: haugoug

Makefile

@@ -40,6 +40,8 @@ tiles_2 		:= $(shell echo $$(( $(tiles) * $(tiles) )))
 tiles_log    	:= $(shell awk 'BEGIN { printf "%.0f", log($(tiles_2))/log(2) }')
 tiles_log_real  := $(shell awk 'BEGIN { printf "%.0f", log($(tiles))/log(2) }')
 
+GVRUN ?= $(GVSOC_DIR)/install/bin/gvrun
+
 .PHONY: gvsoc build
 
 clean:
@@ -82,14 +84,14 @@ run: set_mesh
 ifndef test
 	$(error Proper formatting is: make run test=<test_name> platform=rtl|gvsoc)
 endif
-ifeq (,$(wildcard ./build/bin/$(test)))
+ifeq (,$(wildcard $(CMAKE_BUILDDIR)/bin/$(test)))
 	$(error No test found with name: $(test))
 endif
 ifndef platform
 	$(error Proper formatting is: make run test=<test_name> platform=rtl|gvsoc)
 endif
 ifeq ($(platform), gvsoc)
-	$(GVSOC_DIR)/install/bin/gvsoc --target=magia --binary=./build/bin/$(test) --trace-level=trace run
+	$(GVRUN) --target=magia --param binary=$(CMAKE_BUILDDIR)/bin/$(test) $(GVRUN_ARGS) run
 else ifeq ($(platform), rtl)
 	mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && mkdir -p build
 	cp ./build/bin/$(test) $(BUILD_DIR)/build/verif

testset.cfg

@@ -46,10 +46,9 @@ def tests_build(tile_name, nb_tile, testset):
         test = testset.new_test(test_name)
         cwd = testset.get_path()
         work_dir = f'{cwd}/build/{tile_name}/work/{test_name}'
-        test.add_command(Shell('run', f'gvrun --target magia --build-dir {work_dir} '
-            f'--param binary={cwd}/build/{tile_name}/bin/{test_name} run --attr magia/n_tiles_x={nb_tile} '
-            f'--attr magia/n_tiles_y={nb_tile}'))
-        
+        test.add_command(Shell('run', f'make run platform=gvsoc CMAKE_BUILDDIR={cwd}/build/{tile_name} GVRUN=gvrun test={test_name} GVRUN_ARGS="--work-dir {work_dir}'
+            f' --attr magia/n_tiles_x={nb_tile} --attr magia/n_tiles_y={nb_tile}"'))
+
         if skipped_tests.get(tile_name) is not None and test_name in skipped_tests.get(tile_name):
             print(f"\033[31mSkipping Magia test {test_name} for tile {tile_name}\033")
             test.skip('Failing, to be fixed')
@@ -59,9 +58,8 @@ def testset_build(testset):
 
     testset.set_name('magia-sdk')
 
-    testset.add_target('magia')
-
     for tile in [2, 4, 8]:
         name = f'tile{tile}'
         tile_testset = testset.new_testset(name)
+        tile_testset.add_target('magia')
         tile_testset.add_testset(callback=partial(tests_build, name, tile))