only run the breaking change tests in the presence of the right varD

integration-tests/compatibility/runner.sh

@@ -189,8 +189,16 @@ _main() {
               test_forward_compatibility "$ver"
           done
       fi
+  else
+      # For now we only test that we break with an appropriate error message
+      if [ -s "test_files/2_0_breaking_versions.txt" ]; then
+          list_2_0_breaking_versions | while IFS= read -r ver; do
+              test_2_0_breaking_compatibility "$ver"
+          done
+      fi
   fi
 
+
   # test bidirectional compatibility
   if [[ "$DOLT_USE_ADAPTIVE_ENCODING" -ne "true" ]]; then
       if [ -s "test_files/forward_compatible_versions.txt" ]; then
@@ -200,13 +208,6 @@ _main() {
       fi
   fi
 
-  # test 2.0 breaking compatibility (adaptive encoding)
-  if [ -s "test_files/2_0_breaking_versions.txt" ]; then
-      list_2_0_breaking_versions | while IFS= read -r ver; do
-        test_2_0_breaking_compatibility "$ver"
-      done
-  fi
-
   # sanity check: run tests against current version
   echo "Run the bats tests using current Dolt version hitting repositories from the current Dolt version"
   DEFAULT_BRANCH="$DEFAULT_BRANCH" REPO_DIR="$(pwd)/repos/HEAD" bats --print-output-on-failure ./test_files/bats

integration-tests/compatibility/test_files/setup_repo_2_0_breaking.sh

@@ -6,8 +6,6 @@
 
 set -eo pipefail
 
-export DOLT_USE_ADAPTIVE_ENCODING=true
-
 mkdir "$1"
 cd "$1"