Use prebuilt rules and libcc2rs targets

Author: lucic71

tests/lit/lit/formats/Cpp2RustTest.py

@@ -7,21 +7,29 @@
 import difflib, os, re, shutil, random
 import tomli
 
-def read_rust_version():
-  toolchain_path = os.path.join(os.path.dirname(__file__),
-                                '../../../../libcc2rs/rust-toolchain.toml')
-  with open(toolchain_path, 'rb') as f:
-    return tomli.load(f)['toolchain']['channel']
-
 class Cpp2RustTest(TestFormat):
   def __init__(self):
     self.regex_xfail = re.compile(r"//\s*XFAIL:\s*(.*)")
     self.regex_panic = re.compile(r"//\s*panic\s*(?::\s*(.*))?$", re.MULTILINE)
     self.regex_nocompile = re.compile(r"//\s*no-compile\s*(?::\s*(.*))?$", re.MULTILINE)
     self.regex_nondet_result = re.compile(r"//\s*nondet-result\s*(?::\s*(.*))?$", re.MULTILINE)
-    self.rust_version = read_rust_version()
+    self.rust_version = self.readRustVersion()
     os.environ['RUSTFLAGS'] = '-Awarnings -A dangerous-implicit-autorefs'
 
+  def readRustVersion(self):
+    toolchain_path = os.path.join(os.path.dirname(__file__),
+                                  '../../../../libcc2rs/rust-toolchain.toml')
+    with open(toolchain_path, 'rb') as f:
+      return tomli.load(f)['toolchain']['channel']
+
+  def cargoEnv(self):
+    return dict(os.environ, CARGO_TARGET_DIR=os.path.abspath(self.sharedTargetDir()))
+
+  def sharedTargetDir(self):
+    return os.path.abspath(os.path.join(
+        os.path.dirname(__file__),
+        '../../../../build/tmp/cargo-target'))
+
   def updateExpected(self, generated, expected_path):
     os.makedirs(os.path.dirname(expected_path), exist_ok=True)
     with open(expected_path, 'w') as f:
@@ -120,24 +128,32 @@ def fail(str, code = fail_code):
         fromfile='expected', tofile='generated'))
       return fail('different output\n' + diff)
 
+    pkg_name = "test_" + re.sub(r'[^a-zA-Z0-9_]', '_',
+                                os.path.basename(tmp_dir))
+
     # Check if we can compile the rust file
     with open(tmp_dir + "/rust-toolchain.toml", 'w') as f:
       f.write(f'[toolchain]\nchannel = "{self.rust_version}"\n')
     with open(tmp_dir + "/Cargo.toml", 'w') as f:
       f.write(f"""
 [package]
-name = "test"
+name = "{pkg_name}"
 version = "0.1.0"
 edition = "2021"
 rust-version = "{self.rust_version}"
 
+[[bin]]
+name = "{pkg_name}"
+path = "src/main.rs"
+
 [dependencies]
 libc = "0.2.169"
 libcc2rs = {{ path = "../../../libcc2rs" }}
+rules = {{ path = "../../../rules" }}
 """)
 
     cmd = ['cargo', 'build', '--release', '--quiet']
-    _, err, returncode = lit.util.executeCommand(cmd, tmp_dir)
+    _, err, returncode = lit.util.executeCommand(cmd, tmp_dir, env=self.cargoEnv())
     if should_not_compile:
       if returncode != 0:
         shutil.rmtree(tmp_dir, True)
@@ -146,7 +162,7 @@ def fail(str, code = fail_code):
     if returncode != 0:
       return fail('cargo failed\n' + err)
 
-    rust_bin = tmp_dir + "/target/release/test"
+    rust_bin = os.path.join(self.sharedTargetDir(), "release", pkg_name)
 
     if not skip_run:
       if should_panic: