From 36fc9b140373ffacd90ab45750f97424d3808748 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sat, 29 Feb 2020 22:50:31 +0000
Subject: Run tests from dhall dir

---
 dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall | 2 +-
 dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall | 2 +-
 dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall | 2 +-
 dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall | 2 +-
 dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall | 2 +-
 dhall/tests/import/success/unit/asLocation/Chain1B.dhall        | 2 +-
 dhall/tests/import/success/unit/asLocation/Chain2B.dhall        | 2 +-
 dhall/tests/import/success/unit/asLocation/Chain3B.dhall        | 2 +-
 dhall/tests/import/success/unit/asLocation/HashB.dhall          | 2 +-
 dhall/tests/import/success/unit/asLocation/RelativeB.dhall      | 2 +-
 update-tests.sh                                                 | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall
index 3a8a926..b7d9f3d 100644
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall"
+  "./tests/import/success/unit/asLocation/foo/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall
index 3a8a926..b7d9f3d 100644
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall"
+  "./tests/import/success/unit/asLocation/foo/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall
index b223da6..d54f065 100644
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/bar/import.dhall"
+  "./tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall
index b6301f8..7dd93f7 100644
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
+  "./tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall
index b223da6..d54f065 100644
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/bar/import.dhall"
+  "./tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall
index 6aee0b5..3055c8e 100644
--- a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
+  "./tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall
index 6aba54e..20df611 100644
--- a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
+  "./tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall
index 6aba54e..20df611 100644
--- a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall
+++ b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
+  "./tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/HashB.dhall b/dhall/tests/import/success/unit/asLocation/HashB.dhall
index 6aee0b5..3055c8e 100644
--- a/dhall/tests/import/success/unit/asLocation/HashB.dhall
+++ b/dhall/tests/import/success/unit/asLocation/HashB.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
+  "./tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall
index b3bd255..1ef12f2 100644
--- a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall
+++ b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall
@@ -1,2 +1,2 @@
 < Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
+  "./tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/update-tests.sh b/update-tests.sh
index 1bc0a08..d58b4c5 100755
--- a/update-tests.sh
+++ b/update-tests.sh
@@ -12,7 +12,7 @@ Usage: update-tests.sh [missing | add]
 END
 )
 
-cd "$(dirname "$0")" || exit 1
+cd "$(dirname "$0")/dhall" || exit 1
 
 if [ ! -x "$(which dhall)" ] ; then
     echo "Error: 'dhall' executable not found in PATH"
@@ -89,7 +89,7 @@ function generate_output_file() {
 if [ "$1" = "missing" ]; then
     echo "Generating missing output files..."
     for folder in parser binary-decode semantic-hash import type-inference normalization alpha-normalization; do
-        for root in "./dhall-lang/tests" "./dhall/tests"; do
+        for root in "../dhall-lang/tests" "tests"; do
             # This is not robust to spaces in filenames, but hopefully there should be none
             fd 'A\.dhallb?$' "$root/$folder/success" \
                 | sed 's/A.dhallb\?$//' \
-- 
cgit v1.2.3