From 02476b1f6ef295a05d1b7f6d8f9c9dc4c6a75e54 Mon Sep 17 00:00:00 2001
From: Ming Lei <tom.leiming@gmail.com>
Date: Mon, 13 Nov 2023 09:04:41 +0000
Subject: [PATCH] ci: remove miniublk.wrapper

Now blktests has support to use rublk to run './check ublk', not
necessary to deal with it by miniublk.wrapper any more.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 .github/workflows/test.yml |  4 +---
 ci/miniublk.wrapper        | 28 ----------------------------
 ci/mkosi.build             |  2 --
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100755 ci/miniublk.wrapper

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05540e9..3742960 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,9 +70,7 @@ jobs:
         mkosi ssh /usr/share/rublk/target/debug/test-basic --nocapture
         mkosi ssh "/root/bin/rublk help"
         mkosi ssh "/root/bin/rublk add help"
-        mkosi ssh "ls -l /usr/share/blktests/src/miniublk"
-        mkosi ssh "cat /usr/share/blktests/src/miniublk"
-        mkosi ssh "cd /usr/share/blktests/; ./check ublk"
+        mkosi ssh "cd /usr/share/blktests/; export PATH=/root/bin:$PATH; ./check ublk"
         mkosi ssh "/usr/share/rublk/ci/add_ublk_dev.sh /root/bin/rublk /usr/share/blktests/"
         mkosi ssh "/root/bin/rublk list"
         mkosi ssh "cat /usr/share/blktests/config"
diff --git a/ci/miniublk.wrapper b/ci/miniublk.wrapper
deleted file mode 100755
index 159b5ec..0000000
--- a/ci/miniublk.wrapper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-PARA=""
-ACT=$1
-for arg in $@; do
-  if [ "$arg" = "-t" ]; then
-          continue
-  fi
-
-  if [ "$ACT" = "recover" ]; then
-          if [ "$arg" = "loop" ] || [ "$arg" = "null" ]; then
-                  continue;
-          fi
-
-          if [ -f "$arg" ]; then
-                  continue
-          fi
-          if [ "$arg" = "-f" ]; then
-                  continue
-          fi
-        PARA+=" $arg"
-  else
-        PARA+=" $arg"
-  fi
-done
-
-#echo "miniublk" $PARA
-/root/bin/rublk $PARA
diff --git a/ci/mkosi.build b/ci/mkosi.build
index 77aea85..285cf92 100755
--- a/ci/mkosi.build
+++ b/ci/mkosi.build
@@ -44,7 +44,5 @@ git clone https://github.com/osandov/blktests.git
 cd blktests
 make -j4
 rm -f src/miniublk
-ln ../rublk/ci/miniublk.wrapper src/miniublk
-ls -l src/miniublk
 cd -
 cd -