6.9.0

QL · QL · commit bad770c6c810 · 2020-08-25T10:17:51.000-04:00
diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp.bat b/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp1.bat b/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp.bat b/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp1.bat b/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp.bat b/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp1.bat b/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp.bat b/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp1.bat b/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp.bat b/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp1.bat b/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp.bat b/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal
diff --git a/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp1.bat b/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp1.bat
@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal
diff --git a/examples/qutest/blinky/test/Makefile b/examples/qutest/blinky/test/Makefile
@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/blinky/test/make_efm32 b/examples/qutest/blinky/test/make_efm32
@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/blinky/test/make_tm4c123 b/examples/qutest/blinky/test/make_tm4c123
@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/dpp/test_dpp/Makefile b/examples/qutest/dpp/test_dpp/Makefile
@@ -150,7 +150,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/dpp/test_dpp/make_efm32 b/examples/qutest/dpp/test_dpp/make_efm32
@@ -195,7 +195,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/dpp/test_dpp/make_tm4c123 b/examples/qutest/dpp/test_dpp/make_tm4c123
@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/dpp/test_philo/Makefile b/examples/qutest/dpp/test_philo/Makefile
@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/dpp/test_table/Makefile b/examples/qutest/dpp/test_table/Makefile
@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/evt_par/test/Makefile b/examples/qutest/evt_par/test/Makefile
@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/evt_par/test/make_tm4c123 b/examples/qutest/evt_par/test/make_tm4c123
@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qhsmtst/test/Makefile b/examples/qutest/qhsmtst/test/Makefile
@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qhsmtst/test/make_efm32 b/examples/qutest/qhsmtst/test/make_efm32
@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qhsmtst/test/make_tm4c123 b/examples/qutest/qhsmtst/test/make_tm4c123
@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qmsmtst/test/Makefile b/examples/qutest/qmsmtst/test/Makefile
@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qmsmtst/test/make_efm32 b/examples/qutest/qmsmtst/test/make_efm32
@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/qmsmtst/test/make_tm4c123 b/examples/qutest/qmsmtst/test/make_tm4c123
@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/self_test/test/Makefile b/examples/qutest/self_test/test/Makefile
@@ -146,7 +146,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/self_test/test/make_efm32 b/examples/qutest/self_test/test/make_efm32
@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/self_test/test/make_tm4c123 b/examples/qutest/self_test/test/make_tm4c123
@@ -189,7 +189,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_basic/test/Makefile b/examples/qutest/unity_basic/test/Makefile
@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_basic/test/make_efm32 b/examples/qutest/unity_basic/test/make_efm32
@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_basic/test/make_tm4c123 b/examples/qutest/unity_basic/test/make_tm4c123
@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_basic/test/test_ProductionCode.py b/examples/qutest/unity_basic/test/test_ProductionCode.py
@@ -40,24 +40,24 @@ def on_setup():
 
 test("FunctionWhichReturnsLocalVariable() Should Return The Current Counter Value")
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x5A5A")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x5A5A")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 # This should be true because we can still change our answer
 poke(0, 4, pack('<L', 0x1234))
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x1234")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x1234")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 
 test("FunctionWhichReturnsLocalVariable() Should Return The Current Counter Value Again", NORESET)
 # This should be true again because setup was rerun before this test (and after we changed it to 0x1234)
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x5A5A")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x5A5A")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 
 test("FunctionWhichReturnsLocalVariable() Should Return Current Counter, But Fails Because This Test Is Actually Flawed", NORESET)
 # Sometimes you get the test wrong.  When that happens, you get a failure too... and a quick look should tell
 # you what actually happened...which in this case was a failure to setup the initial condition.
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x1234")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x1234")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 
diff --git a/examples/qutest/unity_mock/test/Makefile b/examples/qutest/unity_mock/test/Makefile
@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_mock/test/make_efm32 b/examples/qutest/unity_mock/test/make_efm32
@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/qutest/unity_mock/test/make_tm4c123 b/examples/qutest/unity_mock/test/make_tm4c123
@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py
diff --git a/examples/workstation/calc/bsp.c b/examples/workstation/calc/bsp.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * Product: Board Support Package (BSP) for the Calculator example
-* Last updated for version 6.8.2
-* Last updated on  2020-06-22
+* Last updated for version 6.9.0
+* Last updated on  2020-06-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -108,7 +108,7 @@ int BSP_eval(double operand1, int oper, double operand2) {
             }
             else {
                 /* error: divide by zero */
-                STRCPY_S(l_display, DISP_WIDTH, " Error 0 ");
+                STRNCPY_S(l_display, DISP_WIDTH, " Error 0 ");
                 ok = 0;
             }
             break;
@@ -123,7 +123,7 @@ int BSP_eval(double operand1, int oper, double operand2) {
         }
         else {
             /* error: out of range */
-            STRCPY_S(l_display, DISP_WIDTH, " Error 1 ");
+            STRNCPY_S(l_display, DISP_WIDTH, " Error 1 ");
             ok = 0;
         }
     }
diff --git a/examples/workstation/calc1/bsp.c b/examples/workstation/calc1/bsp.c
diff --git a/examples/workstation/calc1_sub/bsp.c b/examples/workstation/calc1_sub/bsp.c
diff --git a/examples/workstation/dpp/qview/qview-dpp.bat b/examples/workstation/dpp/qview/qview-dpp.bat
diff --git a/examples/workstation/dpp/qview/qview-dpp1.bat b/examples/workstation/dpp/qview/qview-dpp1.bat
diff --git a/ports/posix-qutest/qutest_port.c b/ports/posix-qutest/qutest_port.c
diff --git a/ports/posix-qutest/safe_std.h b/ports/posix-qutest/safe_std.h
diff --git a/ports/posix-qv/safe_std.h b/ports/posix-qv/safe_std.h
diff --git a/ports/posix/safe_std.h b/ports/posix/safe_std.h
diff --git a/ports/win32-qutest/safe_std.h b/ports/win32-qutest/safe_std.h
diff --git a/ports/win32-qv/safe_std.h b/ports/win32-qv/safe_std.h
diff --git a/ports/win32/safe_std.h b/ports/win32/safe_std.h

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`if "%QTOOLS%"=="" (`
`4`	`4`	`set QTOOLS=C:\qp\qtools`
`5`	`5`	`)`
`6`		`-python %QTOOLS%\qview\qview.py dpp.py`
	`6`	`+python3 %QTOOLS%\qview\qview.py dpp.py`
`7`	`7`
`8`	`8`	`@endlocal`