Test fixes.

facebookresearch · Feb 22, 2022 · a74b552 · a74b552
1 parent edcf57c
commit a74b552
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/tests/llvm/observation_spaces_test.py b/tests/llvm/observation_spaces_test.py
@@ -1212,7 +1212,12 @@ def test_text_size_observation_spaces(env: LlvmEnv):
     env.reset("cbench-v1/crc32")
 
     # Expected .text sizes for this benchmark: -O0, -O3, -Oz.
-    crc32_code_sizes = {"darwin": [1171, 3825, 3289], "linux": [2850, 5652, 4980]}
+    crc32_code_sizes = {"darwin": [16384, 16384, 16384], "linux": [2850, 5652, 4980]}
+
+    # Debugging printout in case of test failure.
+    print(env.observation["TextSizeO0"])
+    print(env.observation["TextSizeO3"])
+    print(env.observation["TextSizeOz"])
 
     key = "TextSizeBytes"
     space = env.observation.spaces[key]

diff --git a/tests/llvm/runtime_test.py b/tests/llvm/runtime_test.py
@@ -9,8 +9,8 @@
 import pytest
 from flaky import flaky
 
+from compiler_gym.datasets import BenchmarkInitError
 from compiler_gym.envs.llvm import LlvmEnv, llvm_benchmark
-from compiler_gym.service.connection import ServiceError
 from tests.test_main import main
 
 pytest_plugins = ["tests.pytest_plugins.llvm"]
@@ -120,11 +120,8 @@ def test_failing_build_cmd(env: LlvmEnv, tmpdir):
 
     env.reset(benchmark=benchmark)
     with pytest.raises(
-        ServiceError,
-        match=(
-            r"Command '\$CC \$IN -invalid-cc-argument -o a.out -c' failed with "
-            r"exit code 1: clang: error: unknown argument: '-invalid-cc-argument'"
-        ),
+        BenchmarkInitError,
+        match="clang: error: unknown argument: '-invalid-cc-argument'",
     ):
         env.observation.Runtime()