From c43d0cbd38ebb1d8bbf60ab3d706e5e997d19e00 Mon Sep 17 00:00:00 2001
From: fpetrini15 <francescogpetrini@gmail.com>
Date: Wed, 27 Nov 2024 13:01:10 -0800
Subject: [PATCH] Review comments

---
 qa/L0_batcher/test.sh    | 5 ++++-
 qa/L0_trt_plugin/test.sh | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qa/L0_batcher/test.sh b/qa/L0_batcher/test.sh
index 5a70f02618..2eed5e3f13 100755
--- a/qa/L0_batcher/test.sh
+++ b/qa/L0_batcher/test.sh
@@ -85,6 +85,9 @@ if [[ -v WSL_DISTRO_NAME ]] || [[ -v MSYSTEM ]]; then
     BACKEND_DIR=${BACKEND_DIR:=C:/tritonserver/backends}
     SERVER=${SERVER:=/mnt/c/tritonserver/bin/tritonserver.exe}
     export WSLENV=$WSLENV:TRITONSERVER_DELAY_SCHEDULER
+    TEST_WINDOWS=1
+    # DLIS-7683 This test fails performance-related response time parameters
+    # when using HTTP protocol. Use gRPC protocol for now as a WAR.
     export USE_GRPC=1
 else
     MODELDIR=${MODELDIR:=`pwd`}
@@ -602,7 +605,7 @@ done
 TEST_CASE=test_multi_batch_preserve_ordering
 
 # Skip test for Windows. Trace file concats at 8192 chars on Windows.
-if  [[ ! -v WSL_DISTRO_NAME ]] && [[ ! -v MSYSTEM ]]; then
+if  [ $TEST_WINDOWS -eq 0 ]; then
     rm -fr ./custom_models && mkdir ./custom_models && \
         cp -r ../custom_models/custom_zero_1_float32 ./custom_models/. && \
         mkdir -p ./custom_models/custom_zero_1_float32/1
diff --git a/qa/L0_trt_plugin/test.sh b/qa/L0_trt_plugin/test.sh
index 40866c00c5..31d444c933 100755
--- a/qa/L0_trt_plugin/test.sh
+++ b/qa/L0_trt_plugin/test.sh
@@ -53,6 +53,7 @@ if [[ -v WSL_DISTRO_NAME ]] || [[ -v MSYSTEM ]]; then
     CUSTOMPLUGIN=${CUSTOMPLUGIN:=$MODELDIR/HardmaxPlugin.dll}
     BACKEND_DIR=${BACKEND_DIR:=C:/tritonserver/backends}
     SERVER=${SERVER:=/mnt/c/tritonserver/bin/tritonserver.exe}
+    TEST_WINDOWS=1
 else
     DATADIR=${DATADIR:="/data/inferenceserver/${REPO_VERSION}"}
     MODELDIR=${MODELDIR:=`pwd`/models}
@@ -135,7 +136,8 @@ SERVER_LD_PRELOAD=$CUSTOMPLUGIN
 SERVER_ARGS=$SERVER_ARGS_BASE
 SERVER_LOG="./inference_server_$LOG_IDX.log"
 
-if  [[ ! -v WSL_DISTRO_NAME ]] && [[ ! -v MSYSTEM ]]; then
+# Skip test for Windows
+if  [ $TEST_WINDOWS -eq 0 ]; then
     run_server
     if [ "$SERVER_PID" == "0" ]; then
         echo -e "\n***\n*** Failed to start $SERVER\n***"