From 3a4f3871964196d57214772cbadbf3f1adb28c60 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 12 Mar 2019 19:13:12 -0500
Subject: [PATCH] Run all tests on CI

---
 .builds.dhall/debian-stable.dhall | 3 +--
 .builds/debian-stable.yml         | 3 +--
 test/test_binary.rb               | 6 +++---
 test/test_normalization.rb        | 6 +++---
 test/test_resolve.rb              | 6 +++---
 test/test_suite.rb                | 8 ++++++++
 6 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 test/test_suite.rb

diff --git a/.builds.dhall/debian-stable.dhall b/.builds.dhall/debian-stable.dhall
index 5e3fd65..7c5e06e 100644
--- a/.builds.dhall/debian-stable.dhall
+++ b/.builds.dhall/debian-stable.dhall
@@ -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
 			''
 		}
 	]
diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml
index 0c290aa..8510215 100644
--- a/.builds/debian-stable.yml
+++ b/.builds/debian-stable.yml
@@ -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
diff --git a/test/test_binary.rb b/test/test_binary.rb
index cf1bf59..a69f79b 100644
--- a/test/test_binary.rb
+++ b/test/test_binary.rb
@@ -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
diff --git a/test/test_normalization.rb b/test/test_normalization.rb
index cd379d3..5dd5f6b 100644
--- a/test/test_normalization.rb
+++ b/test/test_normalization.rb
@@ -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\//
diff --git a/test/test_resolve.rb b/test/test_resolve.rb
index d665652..080df84 100644
--- a/test/test_resolve.rb
+++ b/test/test_resolve.rb
@@ -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|
diff --git a/test/test_suite.rb b/test/test_suite.rb
new file mode 100644
index 0000000..ef84625
--- /dev/null
+++ b/test/test_suite.rb
@@ -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
-- 
2.38.4