From 0c69e99d8b34b5d2dcb615ddf718f437707da4f3 Mon Sep 17 00:00:00 2001
From: Kurtis Rader <krader@skepticism.us>
Date: Fri, 4 Aug 2017 11:01:39 -0700
Subject: [PATCH] use new `logmsg` and `set --show` in tests

---
 tests/alias.err | 6 ++++++
 tests/alias.in  | 5 ++---
 tests/alias.out | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/alias.err b/tests/alias.err
index e69de29bb..7defa80dc 100644
--- a/tests/alias.err
+++ b/tests/alias.err
@@ -0,0 +1,6 @@
+
+####################
+# Avoid regressions of issue #3860 wherein the first word of the alias ends with a semicolon
+
+####################
+# Bare `alias` should list the aliases we have created and nothing else
diff --git a/tests/alias.in b/tests/alias.in
index 6276a5f96..308667811 100644
--- a/tests/alias.in
+++ b/tests/alias.in
@@ -1,5 +1,4 @@
-# Avoid regressions of issue #3860 wherein the first word of the alias ends
-# with a semicolon.
+logmsg Avoid regressions of issue \#3860 wherein the first word of the alias ends with a semicolon
 function foo
     echo ran foo
 end
@@ -8,7 +7,7 @@ my_alias
 
 alias a-2='echo "hello there"'
 
-echo '# bare `alias` should list the aliases we have created and nothing else'
+logmsg Bare `alias` should list the aliases we have created and nothing else
 # We have to exclude two aliases because they're an artifact of the unit test
 # framework and we can't predict the definition.
 alias | grep -Ev '^alias (fish_indent|fish_key_reader) '
diff --git a/tests/alias.out b/tests/alias.out
index 5da9852d3..d91105385 100644
--- a/tests/alias.out
+++ b/tests/alias.out
@@ -1,5 +1,10 @@
+
+####################
+# Avoid regressions of issue #3860 wherein the first word of the alias ends with a semicolon
 ran foo
 foo ran
-# bare `alias` should list the aliases we have created and nothing else
+
+####################
+# Bare `alias` should list the aliases we have created and nothing else
 alias a-2 'echo "hello there"'
 alias my_alias 'foo; and echo foo ran'