WIP - parallel tests

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "base64"
 gem "rspec"
 gem "rake"
-gem "simplecov"
+gem "simplecov", "~> 0.15.0"
 gem "openssl"
 if RbConfig::CONFIG["host"]["msys"]
   gem "json", "2.1.0"

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     base64 (0.3.0)
     date (3.5.1)
     diff-lcs (1.6.2)
-    docile (1.4.1)
+    docile (1.1.5)
     erb (6.0.1)
     json (2.18.0)
     openssl (4.0.0)
@@ -30,12 +30,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
-    simplecov_json_formatter (0.1.4)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     stringio (3.2.0)
     syntax (1.2.2)
     tsort (0.2.0)
@@ -53,7 +52,7 @@ DEPENDENCIES
   rdoc
   redcarpet
   rspec
-  simplecov
+  simplecov (~> 0.15.0)
   syntax
   yard
 

Rakefile.rb

@@ -8,8 +8,6 @@ end
 require "rspec/core/rake_task"
 require "rake/clean"
 require "fileutils"
-require "simplecov"
-require "stringio"
 
 CLEAN.include %w[build_test_run .yardoc yard coverage test_run]
 CLOBBER.include %w[dist gen large_project pkg]
@@ -21,31 +19,14 @@ end
 RSpec::Core::RakeTask.new(:spec, :example_string) do |task, args|
   ENV["specs"] = "1"
   if args.example_string
+    ENV["partial_specs"] = "1"
     task.rspec_opts = %W[-e "#{args.example_string}" -f documentation]
   end
 end
+task :spec => :build_dist
 task :spec do
   ENV.delete("specs")
 end
-task :spec => :build_tests
-task :spec do
-  unless ENV["rscons_dist_specs"]
-    original_stdout = $stdout
-    sio = StringIO.new
-    $stdout = sio
-    SimpleCov.collate Dir["coverage/.resultset.json", "coverage/bt*/.resultset.json"]
-    $stdout = original_stdout
-    sio.string.lines.each do |line|
-      $stdout.write(line) unless line =~ /Coverage report generated for/
-    end
-  end
-end
-
-task :build_tests do |task, args|
-  ENV["specs"] = "1"
-  sh "ruby -Ilib build_tests/build_tests.rb"
-  ENV.delete("specs")
-end
 
 # dspec task is useful to test the distributable release script, but is not
 # useful for coverage information.
@@ -56,7 +37,6 @@ task :dspec, [:example_string] => :build_dist do |task, args|
   FileUtils.cp("dist/rscons", "test_run/rscons.rb")
   ENV["rscons_dist_specs"] = "1"
   Rake::Task["spec"].execute(args)
-  Rake::Task["build_tests"].execute(args)
   ENV.delete("rscons_dist_specs")
   FileUtils.rm_f(Dir.glob(".rscons-*"))
 end

build_tests/simple/abs_rel_paths.rb

@@ -1,14 +0,0 @@
-class B < Builder
-  def run(*args)
-    puts @target
-    true
-  end
-end
-
-env do |env|
-  env.add_builder(B)
-  env.B("one", File.expand_path("two"))
-  env.B("two")
-  env.B("three")
-  env.depends("two", File.expand_path("three"))
-end

build_tests/simple/barrier_builder.rb

@@ -1,15 +0,0 @@
-class B < Builder
-  def run(*args)
-    puts "B:#{@target}"
-    true
-  end
-end
-
-env do |env|
-  env.add_builder(B)
-  env.B("one")
-  env.B("two")
-  env.B("three")
-  env.Barrier(:bar, %w[two three])
-  env.depends("one", :bar)
-end

build_tests/typical/build_hooks_override_vars.rb

@@ -3,6 +3,7 @@ env(echo: :command) do |env|
   env.add_build_hook do |builder|
     if builder.name == "Object" && builder.sources.first =~ %r{one\.c}
       builder.vars["CFLAGS"] << "-O1"
+      builder.sources = ['src/two/two.c']
     elsif builder.name == "Object" && builder.target =~ %r{two\.o}
       new_vars = builder.vars.clone
       new_vars["CFLAGS"] << "-O2"

lib/rscons.rb

@@ -33,7 +33,6 @@ module Rscons
     :Lex,
     :Library,
     :Object,
-    :Precompile,
     :Preprocess,
     :Program,
     :SharedLibrary,
@@ -153,7 +152,6 @@ require_relative "rscons/builders/disassemble"
 require_relative "rscons/builders/lex"
 require_relative "rscons/builders/library"
 require_relative "rscons/builders/object"
-require_relative "rscons/builders/precompile"
 require_relative "rscons/builders/preprocess"
 require_relative "rscons/builders/program"
 require_relative "rscons/builders/shared_library"

lib/rscons/builder.rb

@@ -29,27 +29,19 @@ module Rscons
 
     # @return [String, Symbol]
     #   Target file name.
-    attr_reader :target
+    attr_accessor :target
 
-    # @return [String, Symbol]
-    #   Absolute target file name.
-    attr_reader :abstarget
-
-    # @return [Array<String, Symbol>]
-    #   Source file names.
-    attr_reader :sources
-
-    # @return [Array<String, Symbol>]
-    #   Absolute source file names.
-    attr_reader :abssources
+    # @return [Array<String>]
+    #   Source file name(s).
+    attr_accessor :sources
 
     # @return [Cache]
     #   Cache instance.
-    attr_reader :cache
+    attr_accessor :cache
 
     # @return [Environment]
     #   The {Environment} performing the build operation.
-    attr_reader :env
+    attr_accessor :env
 
     # @return [Hash, VarSet]
     #   Construction variables used to perform the build operation.
@@ -57,7 +49,7 @@ module Rscons
 
     # @return [Set<String>]
     #   Side effect file(s) produced when this builder runs.
-    attr_reader :side_effects
+    attr_accessor :side_effects
 
     # @return [Integer]
     #   Build step.
@@ -79,11 +71,7 @@ module Rscons
     #   Extra construction variables.
     def initialize(options)
       @target = options[:target]
-      @abstarget = Util.absolute_path(@target)
-      @sources = Array(options[:sources])
-      @abssources = @sources.map do |source|
-        Util.absolute_path(source)
-      end
+      @sources = options[:sources]
       @cache = options[:cache]
       @env = options[:env]
       @vars = options[:vars]
@@ -115,7 +103,7 @@ module Rscons
     # @return [void]
     def produces(*side_effects)
       side_effects.each do |side_effect|
-        side_effect_expanded = Util.absolute_path(@env.expand(side_effect))
+        side_effect_expanded = @env.expand(side_effect)
         @env.register_side_effect(side_effect_expanded)
         @side_effects << side_effect_expanded
       end

lib/rscons/builder_set.rb

@@ -27,8 +27,8 @@ module Rscons
       #   env.Directory("dest")
       #   env.Install("dest", "bin")
       #   env.Install("dest", "share")
-      self[builder.abstarget] ||= []
-      self[builder.abstarget] << builder
+      self[builder.target] ||= []
+      self[builder.target] << builder
     end
 
     # Return the number of remaining build steps.
@@ -54,7 +54,7 @@ module Rscons
     #   The next builder to run.
     def get_next_builder_to_run(targets_still_building)
       to_build = self.find do |target, builders|
-        deps = builders.first.abssources + (@build_dependencies[target] || []).to_a
+        deps = builders.first.sources + (@build_dependencies[target] || []).to_a
         # All dependencies must have been built for this target to be ready to
         # build.
         deps.all? do |dep|
@@ -79,7 +79,7 @@ module Rscons
       # not find a builder to run above, then there might be a circular
       # dependency introduced by the user.
       if (self.size > 0) and targets_still_building.empty?
-        raise "Could not find a runnable builder. Possible circular dependency for #{self.first[1].first.target}"
+        raise "Could not find a runnable builder. Possible circular dependency for #{self.keys.first}"
       end
     end
 

lib/rscons/builders/precompile.rb

@@ -1,29 +0,0 @@
-module Rscons
-  module Builders
-    # The Precompile builder generates .di interface files from .d source files
-    # for D.
-    class Precompile < Builder
-
-      # Run the builder to produce a build target.
-      def run(options)
-        if @command
-          finalize_command
-        else
-          if @sources.find {|s| s.end_with?(*@env.expand_varref("${DSUFFIX}", @vars))}
-            pcc = @env.expand_varref("${DC}")
-            if pcc =~ /ldc/
-              dpc_cmd = "${DPC_CMD:ldc}"
-            else
-              dpc_cmd = "${DPC_CMD:gdc}"
-            end
-            @vars["_TARGET"] = @target
-            @vars["_SOURCES"] = @sources
-            command = @env.build_command(dpc_cmd, @vars)
-            standard_command("Precompile <source>#{Util.short_format_paths(@sources)}<reset>", command)
-          end
-        end
-      end
-
-    end
-  end
-end

lib/rscons/cache.rb

@@ -142,14 +142,12 @@ module Rscons
     #   - each cached dependency file's current checksum matches the checksum
     #     stored in the cache file
     def up_to_date?(targets, command, deps, env, options = {})
-      deps = deps.map {|dep| Util.absolute_path(dep)}
       Array(targets).each do |target|
-        abstarget = Util.absolute_path(target)
-        cache_key = get_cache_key(abstarget)
+        cache_key = get_cache_key(target)
 
-        unless Rscons.phony_target?(abstarget)
+        unless Rscons.phony_target?(target)
           # target file must exist on disk
-          unless File.exist?(abstarget)
+          unless File.exist?(target)
             if options[:debug]
               puts "Target #{target} needs rebuilding because it does not exist on disk"
             end
@@ -165,9 +163,9 @@ module Rscons
           return false
         end
 
-        unless Rscons.phony_target?(abstarget)
+        unless Rscons.phony_target?(target)
           # target must have the same checksum as when it was built last
-          unless @cache["targets"][cache_key]["checksum"] == lookup_checksum(abstarget)
+          unless @cache["targets"][cache_key]["checksum"] == lookup_checksum(target)
             if options[:debug]
               puts "Target #{target} needs rebuilding because it has been changed on disk since being built last"
             end
@@ -204,7 +202,7 @@ module Rscons
         end
 
         # set of user dependencies must match
-        user_deps = env.get_user_deps(abstarget) || []
+        user_deps = env.get_user_deps(target) || []
         cached_user_deps = @cache["targets"][cache_key]["user_deps"] || []
         cached_user_deps_fnames = cached_user_deps.map { |dc| dc["fname"] }
         unless user_deps == cached_user_deps_fnames
@@ -249,16 +247,12 @@ module Rscons
     # @return [void]
     def register_build(targets, command, deps, env, options = {})
       Array(targets).each do |target|
-        target = Util.absolute_path(target)
         target_checksum =
           if options[:side_effect] or Rscons.phony_target?(target)
             ""
           else
             calculate_checksum(target)
           end
-        deps = deps.map do |dep|
-          Util.absolute_path(dep)
-        end.uniq
         @cache["targets"][get_cache_key(target)] = {
           "command" => Digest::MD5.hexdigest(command.inspect),
           "checksum" => target_checksum,

lib/rscons/default_construction_variables.rb

@@ -43,8 +43,6 @@ module Rscons
     "DFLAGS" => [],
     "DISASM_CMD" => %w[${OBJDUMP} ${DISASM_FLAGS} ${_SOURCES}],
     "DISASM_FLAGS" => %w[--disassemble --source],
-    "DPC_CMD:ldc" => %w[${DC} -H -Hf ${_TARGET} -o- ${INCPREFIX}${D_IMPORT_PATH} ${DFLAGS} ${_SOURCES}],
-    "DPC_CMD:gdc" => %w[${DC} -H -Hf ${_TARGET} -fsyntax-only ${INCPREFIX}${D_IMPORT_PATH} ${DFLAGS} ${_SOURCES}],
     "DSUFFIX" => %w[.d],
     "D_IMPORT_PATH" => [],
     "INCPREFIX" => "-I",

lib/rscons/environment.rb

@@ -371,8 +371,8 @@ module Rscons
           @builder_sets << build_builder_set
         end
         @builder_sets.last << builder
-        @build_steps += 1 unless builder.is_a?(Rscons::Builders::Barrier)
-        @build_targets[builder.abstarget] = builder
+        @build_steps += 1
+        @build_targets[target] = builder
         builder
       else
         super
@@ -396,10 +396,8 @@ module Rscons
         end
         expand(ud)
       end
-      target = Util.absolute_path(target)
       @user_deps[target] ||= []
-      user_deps.map! {|ud| Util.absolute_path(ud)}
-      user_deps.each do |ud|
+      (@user_deps[target] + user_deps).each do |ud|
         unless Rscons.phony_target?(ud) || @user_deps[target].include?(ud)
           @user_deps[target] << ud
         end
@@ -434,13 +432,13 @@ module Rscons
       targets = Array(targets)
       prerequisites = Array(prerequisites)
       targets.each do |target|
-        target = Util.absolute_path(expand(target))
+        target = expand(target)
         @registered_build_dependencies[target] ||= Set.new
         prerequisites.each do |prerequisite|
           if prerequisite.is_a?(Builder)
             prerequisite = prerequisite.target
           end
-          prerequisite = Util.absolute_path(expand(prerequisite))
+          prerequisite = expand(prerequisite)
           @registered_build_dependencies[target] << prerequisite
         end
       end
@@ -456,9 +454,9 @@ module Rscons
     #
     # @return [void]
     def produces(target, *side_effects)
-      abstarget = Util.absolute_path(expand(target))
+      target = expand(target)
       @builder_sets.reverse.each do |builder_set|
-        if builders = builder_set[abstarget]
+        if builders = builder_set[target]
           builders.last.produces(*side_effects)
           return
         end
@@ -475,7 +473,7 @@ module Rscons
     # @param side_effect [String]
     #   Side effect fiel name.
     def register_side_effect(side_effect)
-      @side_effects << Util.absolute_path(side_effect)
+      @side_effects << side_effect
     end
 
     # Return the list of user dependencies for a given target.
@@ -486,7 +484,6 @@ module Rscons
     #   List of user-specified dependencies for the target, or nil if none were
     #   specified.
     def get_user_deps(target)
-      target = Util.absolute_path(target)
       @user_deps[target]
     end
 
@@ -510,11 +507,10 @@ module Rscons
     # @return [String]
     #   Output file name.
     def register_dependency_build(target, source, suffix, vars, builder_class)
-      target = Util.absolute_path(target)
       output_fname = get_build_fname(source, suffix, builder_class)
       self.__send__(builder_class.name, output_fname, source, vars)
       @registered_build_dependencies[target] ||= Set.new
-      @registered_build_dependencies[target] << Util.absolute_path(output_fname)
+      @registered_build_dependencies[target] << output_fname
       output_fname
     end
 
@@ -591,7 +587,6 @@ module Rscons
     # @return [Builder, nil]
     #   The {Builder} for target, or +nil+ if none found.
     def builder_for(target)
-      target = Util.absolute_path(target)
       @build_targets[target]
     end
 
@@ -735,7 +730,7 @@ module Rscons
       # If no builder was found to run yet and there are threads available, try
       # to get a runnable builder from the builder set.
       targets_still_building = @threads.reduce([]) do |result, (thread, obj)|
-        result << builder_for_thread(thread).abstarget
+        result << builder_for_thread(thread).target
       end
       if @builder_sets.size > 0
         if builder = @builder_sets[0].get_next_builder_to_run(targets_still_building)

lib/rscons/script.rb

@@ -34,7 +34,15 @@ module Rscons
       #
       # @return [Array<String>] Paths matching the specified pattern(s).
       def glob(*patterns)
-        Util.glob(*patterns)
+        require "pathname"
+        patterns.reduce([]) do |result, pattern|
+          if pattern.end_with?("/**")
+            pattern += "/"
+          end
+          result += Dir.glob(pattern).map do |path|
+            Pathname.new(path.gsub("\\", "/")).cleanpath.to_s
+          end
+        end.sort
       end
 
       # Download a file.

lib/rscons/util.rb

@@ -16,21 +16,6 @@ module Rscons
         end
       end
 
-      # Return the absolute path for a given target if not a phony target.
-      #
-      # @param path [String, Symbol, nil]
-      #   Given target name.
-      #
-      # @return [String, Symbol, nil]
-      #   Absolute path of given target.
-      def absolute_path(path)
-        if path.is_a?(String)
-          File.expand_path(path)
-        else
-          path
-        end
-      end
-
       # Colorize a builder run message.
       #
       # @param message [String]
@@ -156,33 +141,6 @@ module Rscons
         result
       end
 
-      # Return a list of paths matching the specified pattern(s).
-      #
-      # A pattern can contain a "/**" component to recurse through directories.
-      # If the pattern ends with "/**" then only the recursive list of
-      # directories will be returned.
-      #
-      # Examples:
-      # - "src/**": return all directories under "src", recursively (including
-      #   "src" itself).
-      # - "src/**/*": return all files and directories recursively under the src
-      #   directory.
-      # - "src/**/*.c": return all .c files recursively under the src directory.
-      # - "dir/*/": return all directories in dir, but no files.
-      #
-      # @return [Array<String>] Paths matching the specified pattern(s).
-      def glob(*patterns)
-        require "pathname"
-        patterns.reduce([]) do |result, pattern|
-          if pattern.end_with?("/**")
-            pattern += "/"
-          end
-          result += Dir.glob(pattern).map do |path|
-            Pathname.new(path.gsub("\\", "/")).cleanpath.to_s
-          end
-        end.sort
-      end
-
       # Make a relative path corresponding to a possibly absolute one.
       #
       # @param path [String]

spec/rscons/environment_spec.rb

@@ -138,6 +138,27 @@ module Rscons
       end
     end
 
+    describe "#depends" do
+      it "records the given dependencies in @user_deps" do
+        env = Environment.new
+        env.depends("foo", "bar", "baz")
+        expect(env.instance_variable_get(:@user_deps)).to eq({"foo" => ["bar", "baz"]})
+      end
+      it "records user dependencies only once" do
+        env = Environment.new
+        env.instance_variable_set(:@user_deps, {"foo" => ["bar"]})
+        env.depends("foo", "bar", "baz")
+        expect(env.instance_variable_get(:@user_deps)).to eq({"foo" => ["bar", "baz"]})
+      end
+      it "expands arguments for construction variable references" do
+        env = Environment.new
+        env["foo"] = "foo.exe"
+        env["bar"] = "bar.c"
+        env.depends("${foo}", "${bar}", "a.h")
+        expect(env.instance_variable_get(:@user_deps)).to eq({"foo.exe" => ["bar.c", "a.h"]})
+      end
+    end
+
     describe "#shell" do
       it "executes the given shell command and returns the results" do
         env = Environment.new

spec/spec_helper.rb

@@ -1,12 +1,8 @@
 if ENV["rscons_dist_specs"]
-  require_relative "../test_run/rscons"
+  require_relative "../test/rscons"
 else
   require "simplecov"
 
-  class MyFormatter
-    def format(*args)
-    end
-  end
   SimpleCov.start do
     add_filter "/spec/"
     add_filter "/.bundle/"
@@ -15,10 +11,9 @@ else
     else
       command_name "RSpec"
     end
-    add_filter "test_run/rscons.rb"
+    add_filter "test/rscons.rb"
     project_name "Rscons"
     merge_timeout 3600
-    formatter(MyFormatter)
   end
 
   require "rscons"