Remove Travis FreeBSD debug acces workaround (ENV_HACK)

.travis.yml

@@ -17,8 +17,6 @@ cache:
 env:
   global:
     - VERILATOR_ROOT=$TRAVIS_BUILD_DIR
-    # Hack around debug mode issues on FreeBSD
-    - ENV_HACK=$([ ! -e $TRAVIS_BUILD_DIR/ci/travis-env-hack.bash ] || $TRAVIS_BUILD_DIR/ci/travis-env-hack.bash)
 
 # The list and order of build stages
 stages:
@@ -122,11 +120,11 @@ jobs:
     - {stage: test, if: type  = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6},  git: {clone: false}, env: TESTS=dist-vlt-1}
     - {stage: test, if: type  = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6},  git: {clone: false}, env: TESTS=vltmt-0}
     - {stage: test, if: type  = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6},  git: {clone: false}, env: TESTS=vltmt-1}
-    # FreeBSD tests - Note these need the git clone in order to pick up the ENV_HACK
+    # FreeBSD tests
-    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=dist-vlt-0}
+    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=dist-vlt-0}
-    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=dist-vlt-1}
+    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=dist-vlt-1}
-    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=vltmt-0}
+    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=vltmt-0}
-    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=vltmt-1}
+    - {stage: test, if: type  = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=vltmt-1}
 
 notifications:
   email:

ci/travis-env-hack.bash

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# DESCRIPTION: Verilator: Travis CI early platform workaround
-#
-# Copyright 2020 by Geza Lore. This program is free software; you
-# can redistribute it and/or modify it under the terms of either the GNU
-# Lesser General Public License Version 3 or the Perl Artistic License
-# Version 2.0.
-#
-# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
-
-################################################################################
-# This script runs very early by setting an env variable to $(<this script>)
-# This is to work around travis-ci issues
-################################################################################
-
-set -e
-set -x
-
-if [ "$TRAVIS_OS_NAME" = "freebsd" ]; then
-  # Needs bash in bin for non-portable #! in scripts
-  sudo ln -s "$(which bash)" /bin/bash
-  # Needs tmate for debug mode (the one in pkg is too old, so build from source)
-  sudo pkg install -y libevent
-  sudo pkg install -y msgpack
-  sudo pkg install -y libssh
-  git clone https://github.com/tmate-io/tmate.git /tmp/tmate-build
-  pushd /tmp/tmate-build
-  git checkout 2.4.0
-  ./autogen.sh
-  ./configure
-  make -j$(sysctl -n hw.ncpu)
-  sudo make install
-  popd
-  # Travis debug scripts also require this to be in /usr/bin rather than
-  # /usr/local/bin whre the abote puts it
-  sudo ln -s "$(which tmate)" /usr/bin/tmate
-fi