Skip to content

Commit

Permalink
fix some bugs
Browse files Browse the repository at this point in the history
- fix tests when `--build` is set
- don't leak `config.example.toml` fd
- don't crash if `config.toml` doesn't exist yet
  • Loading branch information
jyn514 committed Jun 25, 2023
1 parent 24e67d5 commit 1e7f037
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,8 @@ def bootstrap(args):
if not using_default_path or os.path.exists(toml_path):
with open(toml_path) as config:
config_toml = config.read()
else:
config_toml = ''

profile = RustBuild.get_toml_static(config_toml, 'profile')
if profile is not None:
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/bootstrap_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def build_args(self, configure_args=[], args=[], env={}):
parsed = bootstrap.parse_args(args)
build = serialize_and_parse(configure_args, parsed)
build.build_dir = os.environ["BUILD_DIR"]
build.build = os.environ["BUILD_PLATFORM"]
return build.build_bootstrap_cmd(env), env

def test_cargoflags(self):
Expand Down
4 changes: 3 additions & 1 deletion src/bootstrap/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,9 @@ def parse_example_config(known_args, config):
targets = {}
top_level_keys = []

for line in open(rust_dir + '/config.example.toml').read().split("\n"):
with open(rust_dir + '/config.example.toml') as example_config:
example_lines = example_config.read().split("\n")
for line in example_lines:
if cur_section is None:
if line.count('=') == 1:
top_level_key = line.split('=')[0]
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2667,6 +2667,7 @@ impl Step for Bootstrap {
check_bootstrap
.args(["-m", "unittest", "bootstrap_test.py"])
.env("BUILD_DIR", &builder.out)
.env("BUILD_PLATFORM", &builder.build.build.triple)
.current_dir(builder.src.join("src/bootstrap/"))
.args(builder.config.test_args());
try_run(builder, &mut check_bootstrap).unwrap();
Expand Down

0 comments on commit 1e7f037

Please sign in to comment.