Moved regress.sh from examples/projects to tests

Author: rodrigomelo9

Makefile

@@ -2,6 +2,8 @@
 
 .PHONY: docs
 
+export PATH := $(PWD)/tests/mocks:$(PATH)
+
 all: docs lint test
 
 docs:
@@ -14,7 +16,7 @@ lint:
 
 test:
 	pytest
-	cd examples/projects && bash regress.sh --notool
+	cd tests && bash regress.sh
 
 clean:
 	py3clean .

examples/projects/diamond.py

@@ -15,9 +15,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Diamond(odir=f'results/diamond/{args.source}/{args.board}')
@@ -46,11 +43,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/ise.py

@@ -15,9 +15,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Ise(odir=f'results/ise/{args.source}/{args.board}')
@@ -48,11 +45,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/libero.py

@@ -14,9 +14,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Libero(odir=f'results/libero/{args.source}/{args.board}')
@@ -53,11 +50,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/openflow.py

@@ -16,9 +16,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Openflow(odir=f'results/openflow/{args.source}/{args.board}')
@@ -62,11 +59,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/quartus.py

@@ -15,9 +15,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Quartus(odir=f'results/quartus/{args.source}/{args.board}')
@@ -47,11 +44,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/vivado.py

@@ -15,9 +15,6 @@
 parser.add_argument(
     '--action', choices=['make', 'prog', 'all'], default='make'
 )
-parser.add_argument(
-    '--notool', action='store_true'
-)
 args = parser.parse_args()
 
 prj = Vivado(odir=f'results/vivado/{args.source}/{args.board}')
@@ -53,11 +50,7 @@
 
 prj.set_top('Top')
 
-try:
-    if args.action in ['make', 'all']:
-        prj.make()
-    if args.action in ['prog', 'all']:
-        prj.prog()
-except RuntimeError:
-    if not args.notool:
-        raise
+if args.action in ['make', 'all']:
+    prj.make()
+if args.action in ['prog', 'all']:
+    prj.prog()

examples/projects/regress.sh renamed to tests/regress.sh

@@ -19,6 +19,9 @@ TOOLS["vivado"]="zybo arty"
 
 SOURCES=("vlog" "vhdl" "slog")
 
+SDIR=$PWD
+TDIR=../examples/projects
+
 SPECIFIED_TOOL=""
 NOTOOL=false
 while [[ "$#" -gt 0 ]]; do
@@ -27,10 +30,6 @@ while [[ "$#" -gt 0 ]]; do
       SPECIFIED_TOOL="$2"
       shift 2
       ;;
-    --notool)
-      NOTOOL=true
-      shift
-      ;;
     *)
       echo "Invalid option: $1"
       exit 1
@@ -49,11 +48,9 @@ for TOOL in "${!TOOLS[@]}"; do
         continue
       fi
       echo "> $TOOL - $BOARD - $SOURCE"
-      if [[ "$NOTOOL" == true ]]; then
-        python3 $TOOL.py --board $BOARD --source $SOURCE --action all --notool
-      else
-        python3 $TOOL.py --board $BOARD --source $SOURCE --action all
-      fi
+      cd $TDIR;
+      python3 $TOOL.py --board $BOARD --source $SOURCE --action all;
+      cd $SDIR;
     done
   done
 done