From a220a08ba44211f901f619969d7743f3b42752b6 Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Sun, 9 Jan 2022 13:47:38 +0800
Subject: [PATCH] Fix the RZ_BIN_PREFIX test for Windows (#2189)

* Fix the RZ_BIN_PREFIX test for Windows
* Do not use previous VS2019 image
---
 .appveyor.yml        | 4 ++--
 test/db/tools/rz_bin | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index b701fdc629..3294ac9788 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -23,7 +23,7 @@ environment:
     - builder: vs2019_64
       PYTHON: 'C:\\Python38-x64'
       INNO_SETUP: 'C:\\Program Files (x86)\\Inno Setup 6'
-      APPVEYOR_BUILD_WORKER_IMAGE: Previous Visual Studio 2019
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       BUILD_DIR: build
       RUN_TESTS: true
     # VS2017 64 (Dynamic linking)
@@ -110,4 +110,4 @@ artifacts:
   # Binaries
   - path: "%ARTIFACT_ZIP%"
   # Test results
-  - path: test/results.json
\ No newline at end of file
+  - path: test/results.json
diff --git a/test/db/tools/rz_bin b/test/db/tools/rz_bin
index d3cdd57190..170d2b20b7 100644
--- a/test/db/tools/rz_bin
+++ b/test/db/tools/rz_bin
@@ -98,14 +98,11 @@ RUN
 NAME=rz-bin -S, -SS, -rS and -rSS file elf
 FILE=bins/elf/analysis/x86-helloworld-gcc
 CMDS=<<EOF
-!rz-bin -S ${RZ_FILE}|wc -l|awk "{print \$1}"
-!rz-bin -SS ${RZ_FILE}|wc -l|awk "{print \$1}"
-!env RZ_BIN_PREFIX=prixfixe rz-bin -S ${RZ_FILE}
-!env RZ_BIN_PREFIX=prixfixe rz-bin -SS ${RZ_FILE}
+%RZ_BIN_PREFIX=prixfixe
+!rz-bin -S ${RZ_FILE}
+!rz-bin -SS ${RZ_FILE}
 EOF
 EXPECT=<<EOF
-34
-13
 [Sections]
 paddr      size  vaddr      vsize align perm name                        type       flags         
 --------------------------------------------------------------------------------------------------