From cff679061de2b9c884671539006edd1248504b73 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 7 Mar 2022 18:23:25 +0300
Subject: Fix tests for commands output in JSON format

---
 tests/config.testscript | 10 +++++-----
 tests/status.testscript | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/config.testscript b/tests/config.testscript
index c08c3bf..d537c0b 100644
--- a/tests/config.testscript
+++ b/tests/config.testscript
@@ -41,11 +41,11 @@ deinit += -d prj
 
     # While at it, test printing the configurations list in the JSON format.
     #
-    $* list @cfg --stdout-format 'json' >>/~"%EOO%";
+    $* list @cfg --stdout-format 'json' >>~%EOO%;
       [
         {
           "id": 1,
-          "path": "$~/cfg-dir",
+      %    "path": ".+cfg-dir",%
           "name": "cfg",
           "type": "target",
           "default": true,
@@ -281,11 +281,11 @@ deinit += -d prj
 
   # While at it, test printing the configurations list in the JSON format.
   #
-  $* list --stdout-format 'json' >>/~"%EOO%"
+  $* list --stdout-format 'json' >>~%EOO%
     [
       {
         "id": 5,
-        "path": "$~/prj-cfg",
+    %    "path": ".+prj-cfg",%
         "name": "cfg",
         "type": "target",
         "default": true,
@@ -294,7 +294,7 @@ deinit += -d prj
       },
       {
         "id": 4,
-        "path": "$~/prj-host-cfg",
+    %    "path": ".+prj-host-cfg",%
         "name": "host-cfg",
         "type": "host",
         "default": true,
diff --git a/tests/status.testscript b/tests/status.testscript
index 2977e4f..e5e111b 100644
--- a/tests/status.testscript
+++ b/tests/status.testscript
@@ -30,12 +30,14 @@ deinit += -d prj
 
   $* >'prj configured 0.1.0-a.0.19700101000000';
 
-  $* --stdout-format 'json' >>/~"%EOO%";
+  # While at it, test printing the status in the JSON format.
+  #
+  $* --stdout-format 'json' >>~%EOO%;
     [
       {
         "configuration": {
           "id": 1,
-          "path": "$~/prj-cfg",
+    %      "path": ".+prj-cfg",%
           "name": "cfg"
         },
         "packages": [
@@ -72,12 +74,14 @@ deinit += -d prj
     prj configured 0.1.0-a.0.19700101000000
     EOO
 
-  $* --all --stdout-format 'json' >>/~"%EOO%";
+  # While at it, test printing the status in the JSON format.
+  #
+  $* --all --stdout-format 'json' >>~%EOO%;
     [
       {
         "configuration": {
           "id": 1,
-          "path": "$~/prj-cfg1",
+    %      "path": ".+prj-cfg1",%
           "name": "cfg1"
         },
         "packages": [
@@ -89,7 +93,7 @@ deinit += -d prj
       {
         "configuration": {
           "id": 2,
-          "path": "$~/prj-cfg2",
+    %      "path": ".+prj-cfg2",%
           "name": "cfg2"
         },
         "packages": [
-- 
cgit v1.1