From 56398e1127feb1e6a10410ab612a6386a60fe82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20R=C3=BCger?= Date: Fri, 13 Sep 2019 22:06:18 +0300 Subject: [PATCH] Fix load order, travis obviously different support files were loaded different locally than travis probably time stamp, vs abc Anyway, don't rely on dir order, make requires explicit --- test/helper.rb | 7 ++++++- test/support/compiling.rb | 1 + test/support/risc_interpreter.rb | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/helper.rb b/test/helper.rb index 86116324..2fbecb1c 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -24,4 +24,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'test')) require 'rubyx' -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } +require_relative "support/options" +require_relative "support/parfait_test" +require_relative "support/fake_int" +require_relative "support/fake_compiler" +require_relative "support/risc_assert" +require_relative "support/risc_interpreter" diff --git a/test/support/compiling.rb b/test/support/compiling.rb index 42da6144..82079f4f 100644 --- a/test/support/compiling.rb +++ b/test/support/compiling.rb @@ -1,3 +1,4 @@ +require_relative "preloader" module ScopeHelper diff --git a/test/support/risc_interpreter.rb b/test/support/risc_interpreter.rb index 35201994..e1277ea5 100644 --- a/test/support/risc_interpreter.rb +++ b/test/support/risc_interpreter.rb @@ -1,6 +1,7 @@ require "util/eventable" require "risc/interpreter" require_relative "compiling" +require_relative "output" module Risc module Ticker