From 929f075bdde38227cf8a1312fee1b41bc9bc0dcf Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Fri, 21 Feb 2020 18:45:39 +0000 Subject: [PATCH] rename case-conflicting files to enable development on OSX --- ...ce_avl | print -R => addr spa_namespace_avl | print --RAW} | 0 ...eref | print -Rs => spa | head 1 | deref | print --RAW -s} | 0 tests/integration/test_core_generic.py | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/integration/data/regression_output/core/{addr spa_namespace_avl | print -R => addr spa_namespace_avl | print --RAW} (100%) rename tests/integration/data/regression_output/core/{spa | head 1 | deref | print -Rs => spa | head 1 | deref | print --RAW -s} (100%) diff --git a/tests/integration/data/regression_output/core/addr spa_namespace_avl | print -R b/tests/integration/data/regression_output/core/addr spa_namespace_avl | print --RAW similarity index 100% rename from tests/integration/data/regression_output/core/addr spa_namespace_avl | print -R rename to tests/integration/data/regression_output/core/addr spa_namespace_avl | print --RAW diff --git a/tests/integration/data/regression_output/core/spa | head 1 | deref | print -Rs b/tests/integration/data/regression_output/core/spa | head 1 | deref | print --RAW -s similarity index 100% rename from tests/integration/data/regression_output/core/spa | head 1 | deref | print -Rs rename to tests/integration/data/regression_output/core/spa | head 1 | deref | print --RAW -s diff --git a/tests/integration/test_core_generic.py b/tests/integration/test_core_generic.py index e759cc1e..2fc6f31b 100644 --- a/tests/integration/test_core_generic.py +++ b/tests/integration/test_core_generic.py @@ -105,7 +105,7 @@ "addr spa_namespace_avl | print -n", "addr spa_namespace_avl | print -r", "addr spa_namespace_avl | print -nr", - "addr spa_namespace_avl | print -R", + "addr spa_namespace_avl | print --RAW", "addr spa_namespace_avl | deref | print", "addr spa_namespace_avl | print -d", "addr spa_namespace_avl zfs_dbgmsgs | print -d", @@ -113,7 +113,7 @@ "spa | head 1 | member spa_name[1] | print -c", "spa | head 1 | member spa_name[1] | print -cr", "spa | head 1 | deref | print -rs", - "spa | head 1 | deref | print -Rs", + "spa | head 1 | deref | print --RAW -s", # ptype "ptype spa_t",