Update build step accounting to only count within one environment process run
This commit is contained in:
1 parent
9d14cc7eb0
commit
1e5f1043d5
3 files changed
+27
-43
No files matched your search
+11
-11
@@ -2641,7 +2641,7 @@ EOF
|
||||
])
|
||||
end
|
||||
|
||||
it "does include install targets in build progress when doing an install" do
|
||||
it "counts install task targets separately from build task targets" do
|
||||
test_dir "typical"
|
||||
|
||||
Dir.mktmpdir do |prefix|
|
||||
@@ -2651,25 +2651,25 @@ EOF
|
||||
result = run_rscons(args: %w[-f install.rb install])
|
||||
expect(result.stderr).to eq ""
|
||||
verify_lines(lines(result.stdout), [
|
||||
%r{\[1/9\] Compiling},
|
||||
%r{\[2/9\] Compiling},
|
||||
%r{\[\d/9\] Install},
|
||||
%r{\[1/3\] Compiling},
|
||||
%r{\[2/3\] Compiling},
|
||||
%r{\[\d/6\] Install},
|
||||
])
|
||||
end
|
||||
end
|
||||
|
||||
it "includes build steps from all environments when showing build progress" do
|
||||
it "separates build steps from each environment when showing build progress" do
|
||||
test_dir "typical"
|
||||
|
||||
result = run_rscons(args: %w[-f multiple_environments.rb])
|
||||
expect(result.stderr).to eq ""
|
||||
verify_lines(lines(result.stdout), [
|
||||
%r{\[1/6\] Compiling},
|
||||
%r{\[2/6\] Compiling},
|
||||
%r{\[3/6\] Linking},
|
||||
%r{\[4/6\] Compiling},
|
||||
%r{\[5/6\] Compiling},
|
||||
%r{\[6/6\] Linking},
|
||||
%r{\[1/3\] Compiling},
|
||||
%r{\[2/3\] Compiling},
|
||||
%r{\[3/3\] Linking},
|
||||
%r{\[1/3\] Compiling},
|
||||
%r{\[2/3\] Compiling},
|
||||
%r{\[3/3\] Linking},
|
||||
])
|
||||
end
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user