From 872830bdf2fe147b837bf82a884aaf41c9e1c8da Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sat, 9 Mar 2019 15:38:08 +0100
Subject: [PATCH] I give up. Test framework will no longer run on Travis-CI,
 ruby is broken.

---
 .travis.yml                      |  2 +-
 extras/build-tests/nix/build     |  6 +++---
 extras/build-tests/nix/run-tests | 21 ---------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8148de346..5860f17f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: xenial
 compiler:
   - clang
   - gcc
-script: extras/build-tests/nix/run-tests $BUILDCONFIG
+script: extras/build-tests/nix/build $BUILDCONFIG
 env:
   - BUILDCONFIG=""
   - BUILDCONFIG="system-cares"
diff --git a/extras/build-tests/nix/build b/extras/build-tests/nix/build
index 6055c9103..b01016b24 100755
--- a/extras/build-tests/nix/build
+++ b/extras/build-tests/nix/build
@@ -53,6 +53,6 @@ fi
 
 echo ""
 echo ""
-echo "Now running UnrealIRCd test framework..."
-set -x
-extras/build-tests/nix/run-tests
+#echo "Now running UnrealIRCd test framework..."
+#set -x
+#extras/build-tests/nix/run-tests
diff --git a/extras/build-tests/nix/run-tests b/extras/build-tests/nix/run-tests
index 1431ef779..5e76f1975 100755
--- a/extras/build-tests/nix/run-tests
+++ b/extras/build-tests/nix/run-tests
@@ -18,27 +18,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	gem install rspec || true
 else
 	sudo apt-get install git python rake -y
-
-	set +e
-
-	echo "VERSIONS:"
-	ruby --version
-	rvm list rubies
-	ls -ald /usr/bin/ruby* /usr/local/bin/ruby*
-	dpkg --list|grep ruby
-	gem --version
-	# And an attempt to fix things on Travis-CI
-	# (apparently there are mixed python psych .so versions)
-	rvm uninstall 2.5.3
-	rvm uninstall 2.4.5
-	#rvm use system
-	rvm alias create default 2.3.8
-	rvm reset
-	rvm alias create default 2.3.8
-	rvm list
-	sudo apt-get install ruby-dev -y
-	set -e
-	gem --version
 	gem install bundler -v "~>1.0"
 fi