Use "Environment" instead of "Rscons::Environment" in build tests

build_tests/simple/Rsconscript

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Program('simple.exe', Dir['*.c'])
   end
 end

build_tests/simple/absolute_source_path.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
     source_file = File.join(tempdir, "abs.c")
     File.open(source_file, "w") do |fh|

build_tests/simple/bc_produces.rb

@@ -13,7 +13,7 @@ class MyObject < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(MyObject.new)
     File.open("test.xyz", "w") do |fh|
       fh.puts <<EOF

build_tests/simple/build_sources.rb

@@ -9,7 +9,7 @@ class MyProgram < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(MyProgram.new)
     env.Object("simple.o", "simple.c")
     File.open("two.c", "wb") do |fh|

build_tests/simple/builder_no_sources.rb

@@ -4,7 +4,7 @@ class TestBuilder < Rscons::Builder
   end
 end
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(TestBuilder.new)
     env.TestBuilder("file")
   end

build_tests/simple/cache_command_change.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env["LIBS"] += ["c"]
     env.Program('simple.exe', Dir['*.c'])
   end

build_tests/simple/cache_debugging.rb

@@ -26,7 +26,7 @@ class DebugBuilder < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(DebugBuilder.new)
     if Rscons.vars["new_user_dep"]
       env.depends("foo.o", "new_dep")

build_tests/simple/cache_dep_checksum_change.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Copy("simple.copy", "simple.c")
   end
 end

build_tests/simple/cache_new_dep1.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env.process
     env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]

build_tests/simple/cache_new_dep2.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]
     env.Program('simple.exe', ["simple.o"])

build_tests/simple/cache_successful_builds_when_one_fails.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env.Object("two.o", "two.c")
   end

build_tests/simple/cache_user_dep.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     target = env.Program("simple.exe", "simple.c")
     user_deps = File.read("user_deps", mode: "rb").split(" ")
     target.depends(*user_deps)

build_tests/simple/cache_varset.rb

@@ -15,7 +15,7 @@ class TestBuilder < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(TestBuilder.new)
     env.TestBuilder("foo")
   end

build_tests/simple/clear_targets.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Program("simple.exe", "simple.c")
     env.clear_targets
   end

build_tests/simple/clone_n_threads.rb

@@ -1,5 +1,5 @@
 build do
-  base_env = Rscons::Environment.new do |env|
+  base_env = Environment.new do |env|
     env.n_threads = 165
   end
 

build_tests/simple/command.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new(echo: :command) do |env|
+  Environment.new(echo: :command) do |env|
     env["LD"] = "gcc"
     env.Program('simple.exe', Dir['*.c'])
   end

build_tests/simple/command_builder.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     command = %W[gcc -o ${_TARGET} ${_SOURCES}]
     env.Command("simple.exe",
                 "simple.c",

build_tests/simple/command_redirect.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env.Command("simple.txt",
                 "simple.o",

build_tests/simple/cvar_array.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env["sources"] = Rscons.glob("*.c")
     env.Program("simple.exe", "${sources}")
   end

build_tests/simple/directory.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Directory("teh_dir")
   end
 end

build_tests/simple/disassemble.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env.Disassemble("simple.txt", "simple.o")
   end

build_tests/simple/dump.rb

@@ -1,5 +1,5 @@
 build do
-  env = Rscons::Environment.new do |env|
+  env = Environment.new do |env|
     env["CFLAGS"] += %w[-O2 -fomit-frame-pointer]
     env[:foo] = :bar
   end

build_tests/simple/error_circular_dependency.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Command("foo", "bar")
     env.Command("bar", "baz")
     env.Command("baz", "foo")

build_tests/simple/error_circular_dependency2.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Command("foo", "foo")
   end
 end

build_tests/simple/error_unknown_suffix.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     File.open("foo.xyz", "wb") do |fh|
       fh.puts("hi")
     end

build_tests/simple/link_flag_change.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new(echo: :command) do |env|
+  Environment.new(echo: :command) do |env|
     env["LD"] = "gcc"
     env["LIBPATH"] += ["libdir"]
     env.Program('simple.exe', Dir['*.c'])

build_tests/simple/override_cccmd.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new(echo: :command) do |env|
+  Environment.new(echo: :command) do |env|
     env.Object("simple.o", "simple.c",
                "CCCMD" => %w[${CC} -c -o ${_TARGET} -Dfoobar ${_SOURCES}])
   end

build_tests/simple/override_depfilesuffix.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new(echo: :command) do |env|
+  Environment.new(echo: :command) do |env|
     env["DEPFILESUFFIX"] = ".deppy"
     env.Object("simple.o", "simple.c")
   end

build_tests/simple/phony_target.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(:Checker) do |target, sources, cache, env, vars|
       unless cache.up_to_date?(target, :Checker, sources, env)
         puts "Checker #{sources.first}" if env.echo != :off

build_tests/simple/preprocess.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Preprocess("simplepp.c", "simple.c")
     env.Program("simple.exe", "simplepp.c")
   end

build_tests/simple/progsuffix.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env["PROGSUFFIX"] = ".out"
     env.Program("simple", Dir["*.c"])
   end

build_tests/simple/progsuffix2.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env["MYSUFFIX"] = ".out"
     env.Program("simple${MYSUFFIX}", Dir["*.c"])
   end

build_tests/simple/progsuffix3.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Program("simple", Dir["*.c"], "PROGSUFFIX" => ".xyz")
   end
 end

build_tests/simple/register_target_in_build_hook.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.Program("simple.exe", Dir["*.c"])
     env.add_build_hook do |build_op|
       if build_op[:target].end_with?(".o")

build_tests/simple/run_builder.rb

@@ -6,7 +6,7 @@ class MyObject < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(MyObject.new)
     env.MyObject("simple.o", "simple.c")
     env.Program("simple.exe", "simple.o")

build_tests/simple/standard_build.rb

@@ -11,7 +11,7 @@ build do
     end
   end
 
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(MyCommand.new)
     command = %w[gcc -c -o ${_TARGET} ${_SOURCES}]
     env.MyCommand("simple.o", "simple.c", "CMD" => command)

build_tests/simple/threading.rb

@@ -19,7 +19,7 @@ class NonThreadedTestBuilder < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(ThreadedTestBuilder.new)
     env.add_builder(NonThreadedTestBuilder.new)
     env.ThreadedTestBuilder("a")

build_tests/simple/user_dep_build_order.rb

@@ -15,7 +15,7 @@ class TestBuilder < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(TestBuilder.new)
     env.TestBuilder("one", [], "wait_time" => "3")
     env.TestBuilder("two", [], "wait_time" => "0")

build_tests/simple/user_dependencies.rb

@@ -1,5 +1,5 @@
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     program = env.Program("simple.exe", Dir["*.c"])
     env.depends(program, "program.ld")
   end

build_tests/simple/wait_for_builds_on_failure.rb

@@ -12,7 +12,7 @@ class Fail < Rscons::Builder
 end
 
 build do
-  Rscons::Environment.new do |env|
+  Environment.new do |env|
     env.add_builder(Fail.new)
     4.times do |i|
       wait_time = i + 1