Update tests for concat

cc3-ug · Jan 29, 2025 · 26c2e48 · 26c2e48
1 parent 8fe12e6
commit 26c2e48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/classroom.yml b/.github/workflows/classroom.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 jobs:
   run-autograding-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.actor != 'github-classroom[bot]'
     steps:
       - name: Checkout repository
@@ -24,4 +24,4 @@ jobs:
         run: pip install pycparser tabulate psutil
 
       - name: Run tests
-        run: ./check
+        run: ./check
diff --git a/grading/check.py b/grading/check.py
@@ -167,7 +167,7 @@ def check_concatbits():
             exp = exp.strip()
             out = out.strip()
             if exp == out:
-                grade += 35 / 6
+                grade += 35 / 8
             else:
                 wrong += 1
         if wrong == 6:

diff --git a/tests/concat_bits_test.c b/tests/concat_bits_test.c
@@ -16,6 +16,8 @@ int main(int argc, const char * argv[]) {
   test_concat_bits(0x000000cc, 4, 0x00000044, 4, 0xffffffc4);
   test_concat_bits(0x000000aa, 8, 0x0000cccc, 16, 0xffaacccc);
   test_concat_bits(0x00000066, 6, 0xfffffccc, 10, 0xffff98cc);
+  test_concat_bits(0x87654321, 12, 0x12345678, 12, 0x00321678);
+  test_concat_bits(0x87654321, 16, 0x12345678, 16, 0x43215678);
   printf("\n");
   return 0;
 }