mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-08 05:52:55 +00:00
Use stable coverage API with rustc 1.60
This commit is contained in:
committed by
Kirill Bulatov
parent
a48f9f377d
commit
698d6d0bad
@@ -75,8 +75,6 @@ class Cargo:
|
|||||||
def rustlib_dir(self) -> Path:
|
def rustlib_dir(self) -> Path:
|
||||||
if not self._rustlib_dir:
|
if not self._rustlib_dir:
|
||||||
cmd = [
|
cmd = [
|
||||||
'cargo',
|
|
||||||
'-Zunstable-options',
|
|
||||||
'rustc',
|
'rustc',
|
||||||
'--print=target-libdir',
|
'--print=target-libdir',
|
||||||
]
|
]
|
||||||
@@ -397,7 +395,7 @@ class State:
|
|||||||
# Enable LLVM's source-based coverage
|
# Enable LLVM's source-based coverage
|
||||||
# see: https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
|
# see: https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
|
||||||
# see: https://blog.rust-lang.org/inside-rust/2020/11/12/source-based-code-coverage.html
|
# see: https://blog.rust-lang.org/inside-rust/2020/11/12/source-based-code-coverage.html
|
||||||
'-Zinstrument-coverage',
|
'-Cinstrument-coverage',
|
||||||
# Link every bit of code to prevent "holes" in coverage report
|
# Link every bit of code to prevent "holes" in coverage report
|
||||||
# see: https://doc.rust-lang.org/rustc/codegen-options/index.html#link-dead-code
|
# see: https://doc.rust-lang.org/rustc/codegen-options/index.html#link-dead-code
|
||||||
'-Clink-dead-code',
|
'-Clink-dead-code',
|
||||||
@@ -410,10 +408,6 @@ class State:
|
|||||||
f'--remap-path-prefix {self.cwd}=',
|
f'--remap-path-prefix {self.cwd}=',
|
||||||
])
|
])
|
||||||
|
|
||||||
# XXX: God, have mercy on our souls...
|
|
||||||
# see: https://github.com/rust-lang/rust/pull/90132
|
|
||||||
os.environ['RUSTC_BOOTSTRAP'] = '1'
|
|
||||||
|
|
||||||
def _merge_profraw(self) -> bool:
|
def _merge_profraw(self) -> bool:
|
||||||
profdata_path = self.profdata_dir / '-'.join([
|
profdata_path = self.profdata_dir / '-'.join([
|
||||||
self.profraw_prefix,
|
self.profraw_prefix,
|
||||||
|
|||||||
Reference in New Issue
Block a user