Merge remote-tracking branch 'origin/mungre/strings' into proposed-updates

Author: mungre

.github/workflows/actions.yml

@@ -1,3 +1,5 @@
+name: Build and run tests
+
 on: [push, pull_request]
 
 jobs:
@@ -17,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - run: cmake .
       - run: make
-      - run: make test
+      - run: make test CTEST_OUTPUT_ON_FAILURE=TRUE
   make:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -26,4 +28,16 @@ jobs:
     name: Compile via Makefile on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - run: make -C src all
+      - run: make -C src all VERBOSE=1
+  msbuild:
+    runs-on: windows-2019
+    name: Compile via msbuild on Windows
+    steps:
+      - name: Add msbuild to PATH
+        uses: microsoft/[email protected]
+      - uses: actions/checkout@v2
+      - name: Build Binary
+        shell: cmd
+        working-directory: .\src\VS2010
+        run: call .\build.cmd
+      - run: python test\testrunner.py -v

.gitignore

@@ -3,3 +3,7 @@
 *.swp
 /beebasm
 /src/objects
+test/testlog.txt
+test/**/test
+test/**/test.ssd
+test/**/testgold.txt

CMakeLists.txt

@@ -19,3 +19,4 @@ install(FILES ${CMAKE_SOURCE_DIR}/beebasm.1 DESTINATION share/man/man1)
 enable_testing()
 
 add_test(NAME Runs COMMAND ./beebasm -i demo.6502 -do demo.ssd -boot Code -v)
+add_test(NAME Tests COMMAND python3 test/testrunner.py -v)

examples/local-forward-branch-3.6502

@@ -53,6 +53,9 @@ LDLIBS			:=		-lm
 
 PARAMS			:=		-i ../demo.6502 -do ../demo.ssd -boot Code -v
 
+# Command to run the tests
+
+TEST			:=		cd .. && python3 test/testrunner.py
 
 
 #--------------------------------------------------------------------------------------------------

src/Makefile

@@ -145,9 +145,11 @@ CPUS			?=		1
 ifdef VERBOSE
 VB				:=
 VB_MAKE			:=
+VB_TEST			:=	-v
 else
 VB				:=		@@
 VB_MAKE			:=		-s
+VB_TEST			:=
 endif
 
 
@@ -168,6 +170,7 @@ help:
 	$(ECHO) make all .... Build and run code
 	$(ECHO) make code ... Build code
 	$(ECHO) make run .... Run code
+	$(ECHO) make test ... Run tests
 	$(ECHO) make clean .. Clean code
 	$(ECHO) make help ... Display this message again
 	$(ECHO)
@@ -192,7 +195,11 @@ run:
 	$(VB)$(TARGET) $(PARAMS)
 
 
-all: code run
+test:
+	$(VB)$(TEST) $(VB_TEST)
+
+
+all: code run test
 
 
 clean:

src/Makefile.inc

@@ -0,0 +1 @@
+msbuild /target:Build /property:Configuration=Release /property:Platform=Win32 BeebAsm.vcxproj

src/VS2010/build.cmd

@@ -207,7 +207,7 @@ DEFINE_SYNTAX_EXCEPTION( ParameterCount, "Wrong number of parameters." );
 DEFINE_SYNTAX_EXCEPTION( NoImplied, "Implied mode not allowed for this instruction." );
 DEFINE_SYNTAX_EXCEPTION( ImmTooLarge, "Immediate constants cannot be greater than 255." );
 DEFINE_SYNTAX_EXCEPTION( ImmNegative, "Constant cannot be negative." );
-DEFINE_SYNTAX_EXCEPTION( UnexpectedComma, "Unexpected comma enountered." );
+DEFINE_SYNTAX_EXCEPTION( UnexpectedComma, "Unexpected comma encountered." );
 DEFINE_SYNTAX_EXCEPTION( NoImmediate, "Immediate mode not allowed for this instruction." );
 DEFINE_SYNTAX_EXCEPTION( NoIndirect, "Indirect mode not allowed for this instruction." );
 DEFINE_SYNTAX_EXCEPTION( 6502Bug, "JMP (addr) will not execute as intended due to the 6502 bug (addr = &xxFF)." );