asm files are compiled at test run

laudominik · Sep 19, 2023 · 1e0f856 · 1e0f856
1 parent 80ee844
commit 1e0f856
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -32,6 +32,10 @@ jobs:
          boost_version: ${{env.BOOST_VERSION}}
          cache: true
 
+    - name: Build assembly 
+      working-directory: ${{github.workspace}}
+      run: ./scripts/assemble.sh
+
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .vscode
 build/
+test/data/compiled/
 
 # Prerequisites
 *.d

diff --git a/test/data/asm/push.asm b/test/data/asm/push.asm
@@ -1,5 +1,3 @@
-; usage: InstructionTest.testPush
-
 .global _start
 _start:
     push eax

diff --git a/test/data/compiled/noops b/test/data/compiled/noops
diff --git a/test/data/compiled/push b/test/data/compiled/push
diff --git a/test/data/compiled/example_hex_file → test/data/example_hex_file b/test/data/compiled/example_hex_file → test/data/example_hex_file
diff --git a/test/memory.cpp b/test/memory.cpp
@@ -45,7 +45,7 @@ TEST(MemoryTest, testRead){
 }
 
 TEST(MemoryTest, testOpenFile){
-    TestableMemory memory("../../test/data/compiled/example_hex_file");
+    TestableMemory memory("../../test/data/example_hex_file");
     ASSERT_EQ(memory.size(), testMemorySize);
     EXPECT_EQ(memory.read<Byte>(0x0), 'a');
     EXPECT_EQ(memory.read<Byte>(0x1), 'b');