6 files changed, 19 insertions(+), 13 deletions(-)

M .builds.dhall/debian-stable.dhall
M .builds/debian-stable.yml
M test/test_binary.rb
M test/test_normalization.rb
M test/test_resolve.rb
A test/test_suite.rb

@@ 20,8 20,7 @@
 			test/normalization/gen
 			rubocop
 			bundle install --path="../.gems"
-			bundle exec ruby -Ilib test/test_binary.rb
-			bundle exec ruby -Ilib test/test_normalization.rb
+			bundle exec ruby -Ilib test/test_suite.rb
 			''
 		}
 	]

@@ 10,8 10,7 @@ tasks:
     test/normalization/gen
     rubocop
     bundle install --path="../.gems"
-    bundle exec ruby -Ilib test/test_binary.rb
-    bundle exec ruby -Ilib test/test_normalization.rb
+    bundle exec ruby -Ilib test/test_suite.rb
 packages:
 - bundler
 - git-extras

@@ 6,10 6,10 @@ require "pathname"
 require "dhall/ast"
 require "dhall/binary"
 
-DIRPATH = Pathname.new(File.dirname(__FILE__))
-TESTS = DIRPATH + "../dhall-lang/tests/parser/success/"
-
 class TestParser < Minitest::Test
+	DIRPATH = Pathname.new(File.dirname(__FILE__))
+	TESTS = DIRPATH + "../dhall-lang/tests/parser/success/"
+
 	Pathname.glob(TESTS + "*B.dhallb").each do |path|
 		test = path.basename("B.dhallb").to_s
 		define_method("test_#{test}") do

@@ 7,10 7,10 @@ require "dhall/ast"
 require "dhall/binary"
 require "dhall/normalize"
 
-DIRPATH = Pathname.new(File.dirname(__FILE__))
-TESTS = DIRPATH + "normalization/"
-
 class TestNormalization < Minitest::Test
+	DIRPATH = Pathname.new(File.dirname(__FILE__))
+	TESTS = DIRPATH + "normalization/"
+
 	Pathname.glob(TESTS + "**/*A.dhallb").each do |path|
 		test = path.relative_path_from(TESTS).to_s.sub(/A\.dhallb$/, "")
 		next if test =~ /prelude\//

@@ 7,10 7,10 @@ require "dhall/resolve"
 require "dhall/normalize"
 require "dhall/binary"
 
-DIRPATH = Pathname.new(File.dirname(__FILE__))
-TESTS = DIRPATH + "normalization/"
-
 class TestResolve < Minitest::Test
+	DIRPATH = Pathname.new(File.dirname(__FILE__))
+	TESTS = DIRPATH + "normalization/"
+
 	def setup
 		@resolver = Dhall::Resolvers::Default.new(
 			path_reader: lambda do |sources|

@@ 0,0 1,8 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+DIRPATH = Pathname.new(File.dirname(__FILE__))
+Pathname.glob(DIRPATH + "test_*.rb").each do |path|
+	require_relative path.basename
+end