Remove Rscons.application.vars

spec/build_tests_spec.rb

@@ -1544,16 +1544,19 @@ EOF
         test_dir("simple")
         result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
-        result = run_rscons(args: %w[-f cache_debugging.rb build command_change=yes])
+        passenv["test"] = "command_change"
+        result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
         expect(result.stdout).to match /Target foo\.o needs rebuilding because the command used to build it has changed/
       end
 
       it "prints a message when strict_deps is in use and the set of dependencies does not match" do
         test_dir("simple")
-        result = run_rscons(args: %w[-f cache_debugging.rb build strict_deps1=yes])
+        passenv["test"] = "strict_deps1"
+        result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
-        result = run_rscons(args: %w[-f cache_debugging.rb build strict_deps2=yes])
+        passenv["test"] = "strict_deps2"
+        result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
         expect(result.stdout).to match /Target foo\.o needs rebuilding because the :strict_deps option is given and the set of dependencies does not match the previous set of dependencies/
       end
@@ -1562,7 +1565,8 @@ EOF
         test_dir("simple")
         result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
-        result = run_rscons(args: %w[-f cache_debugging.rb build new_dep=yes])
+        passenv["test"] = "new_dep"
+        result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
         expect(result.stdout).to match /Target foo\.o needs rebuilding because there are new dependencies/
       end
@@ -1571,7 +1575,8 @@ EOF
         test_dir("simple")
         result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
-        result = run_rscons(args: %w[-f cache_debugging.rb build new_user_dep=yes])
+        passenv["test"] = "new_user_dep"
+        result = run_rscons(args: %w[-f cache_debugging.rb])
         expect(result.stderr).to eq ""
         expect(result.stdout).to match /Target foo\.o needs rebuilding because the set of user-specified dependency files has changed/
       end
@@ -2331,7 +2336,7 @@ EOF
     it "does everything" do
       test_dir "configure"
       create_exe "pkg-config", "echo '-DMYPACKAGE'"
-      result = run_rscons(args: %w[-f everything.rb configure --build=bb --prefix=/my/prefix])
+      result = run_rscons(args: %w[-f everything.rb --build=bb configure --prefix=/my/prefix])
       expect(result.stderr).to eq ""
       expect(result.status).to eq 0
       expect(result.stdout).to match /Configuring configure test\.\.\./