Fix test targets in Makefile

.ci.yml

@@ -8,7 +8,9 @@ before_script:
 
 test:
   script:
-    - ./.github/scripts/test.sh
+    - make testall
+    - mkdir out/
+    - mv out*.png out/
   artifacts:
     paths:
       - out/

.github/workflows/build.yml

@@ -9,4 +9,4 @@ jobs:
       - name: Test
         run: |
          ./.github/scripts/setup-environment.sh
-         ./.github/scripts/test.sh
+         make testall

Makefile

@@ -12,11 +12,21 @@ export TAG
 verilog:
 	$(SBT) "runMain $(DRIVER)"
 
-test:
+testsetup:
 	convert -resize $(SIZE_HALF)x$(SIZE_HALF) $(IMG) img0.rgba
 	convert -resize $(SIZE)x$(SIZE) $(IMG) img1.rgba
-	$(SBT) "testOnly -t *$(TB)"
-	convert -size $(SIZE)x$(SIZE) -depth 8 out.rgba out.png
+
+testM2M: export DMACONFIG = AXI_AXIL_AXI
+testM2M: testsetup 
+	$(SBT) "test:testOnly -t *$(TB)"
+	convert -size $(SIZE)x$(SIZE) -depth 8 out.rgba outM2M.png
+
+testS2M: export DMACONFIG = AXIS_AXIL_AXI
+testS2M: testsetup
+	$(SBT) "test:testOnly -t *$(TB)"
+	convert -size $(SIZE)x$(SIZE) -depth 8 out.rgba outS2M.png
+
+test: testS2M testM2M
 
 testall: test
 	$(SBT) "test"