Skip to content

Add tests to rustbuild #48913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 4, 2018
Merged

Add tests to rustbuild #48913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
84b5b34
Stop accessing current_dir in bootstrap
Mark-Simulacrum Mar 10, 2018
a5e56b6
Permit constructing Builder without executing
Mark-Simulacrum Mar 10, 2018
e7342b8
Permit constructing Build without executing
Mark-Simulacrum Mar 10, 2018
cd33d3a
Stub out various functions during testing
Mark-Simulacrum Mar 10, 2018
fde70b0
Make test steps sortable
Mark-Simulacrum Mar 10, 2018
8fd42ec
Extract default Config into function
Mark-Simulacrum Mar 10, 2018
42fde21
Add tests to rustbuild
Mark-Simulacrum Mar 10, 2018
f4620a3
Stub out less code
Mark-Simulacrum Mar 15, 2018
b0dbc7c
Implement generating graphs of the build steps
Mark-Simulacrum Mar 27, 2018
a727447
Refactor to use a dry-run config instead of cfg(test)
Mark-Simulacrum Mar 27, 2018
545b92f
Avoid printing output when in dry run mode
Mark-Simulacrum Mar 28, 2018
0ce5cf0
Fix a few accidental expectations
Mark-Simulacrum Apr 1, 2018
184d3bc
Stop checking that the graph produced by a dry run is equivalent
Mark-Simulacrum Apr 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/bootstrap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ serde_json = "1.0.2"
toml = "0.4"
lazy_static = "0.2"
time = "0.1"
petgraph = "0.4.12"

[dev-dependencies]
pretty_assertions = "0.5"
5 changes: 4 additions & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def __init__(self):
self.build_dir = os.path.join(os.getcwd(), "build")
self.clean = False
self.config_toml = ''
self.rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
self.rust_root = ''
self.use_locked_deps = ''
self.use_vendored_sources = ''
self.verbose = False
Expand Down Expand Up @@ -710,6 +710,7 @@ def bootstrap(help_triggered):
parser = argparse.ArgumentParser(description='Build rust')
parser.add_argument('--config')
parser.add_argument('--build')
parser.add_argument('--src')
parser.add_argument('--clean', action='store_true')
parser.add_argument('-v', '--verbose', action='count', default=0)

Expand All @@ -718,6 +719,7 @@ def bootstrap(help_triggered):

# Configure initial bootstrap
build = RustBuild()
build.rust_root = args.src or os.path.abspath(os.path.join(__file__, '../../..'))
build.verbose = args.verbose
build.clean = args.clean

Expand Down Expand Up @@ -788,6 +790,7 @@ def bootstrap(help_triggered):
env["SRC"] = build.rust_root
env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
env["BOOTSTRAP_PYTHON"] = sys.executable
env["BUILD_DIR"] = build.build_dir
run(args, env=env, verbose=build.verbose)


Expand Down
Loading