From 55e292681e7bf624d8454ff06a063dd5b9efa318 Mon Sep 17 00:00:00 2001
From: Sylvain Pelissier <sylvain.pelissier@gmail.com>
Date: Wed, 4 Oct 2023 08:34:11 +0000
Subject: [PATCH] Load plugins when running extra tests ##r2r

Co-authored-by: Sylvain Pelissier <sylvain.pelissier@kudelskisecurity.com>
---
 binr/r2r/run.c          | 13 +++++++++----
 test/db/extras/cmd/yara | 10 +++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/binr/r2r/run.c b/binr/r2r/run.c
index c7e2fc085a..a240f1022b 100644
--- a/binr/r2r/run.c
+++ b/binr/r2r/run.c
@@ -894,7 +894,10 @@ static R2RProcessOutput *run_r2_test(R2RRunConfig *config, ut64 timeout_ms, int
 	// r_pvector_push (&args, "-ebin.types=false");
 	r_pvector_push (&args, "-escr.color=0");
 	r_pvector_push (&args, "-escr.interactive=0");
-	r_pvector_push (&args, "-NN");
+
+	if (!load_plugins) {
+		r_pvector_push (&args, "-NN");
+	}
 	RListIter *it;
 	void *extra_arg, *file_arg;
 	if (extra_args) {
@@ -917,9 +920,11 @@ static R2RProcessOutput *run_r2_test(R2RRunConfig *config, ut64 timeout_ms, int
 	r_pvector_push (&envvars, "ANSICON");
 	r_pvector_push (&envvals, "1");
 #endif
-	r_pvector_push (&envvars, "R2_NOPLUGINS");
-	r_pvector_push (&envvals, "1");
-
+	if (!load_plugins) {
+		r_pvector_push (&envvars, "R2_NOPLUGINS");
+		r_pvector_push (&envvals, "1");
+	}
+	
 	if (extra_env)
 	{
 		RListIter * eit;
diff --git a/test/db/extras/cmd/yara b/test/db/extras/cmd/yara
index fd84b42e8e..36162f855f 100644
--- a/test/db/extras/cmd/yara
+++ b/test/db/extras/cmd/yara
@@ -1,7 +1,7 @@
-NAME=yara: scan
+NAME=yara scan
 FILE=bins/elf/vim
 CMDS=<<EOF
-yara scan
+yrs
 f
 EOF
 EXPECT=<<EOF
@@ -20,11 +20,11 @@ SHA256_Constants
 EOF
 RUN
 
-NAME=yara: scanS
+NAME=yara: scan with strings
 FILE=malloc://1024
 CMDS=<<EOF
 wx cffbc0b5e9b5dba5a5dbb5e9d728ae2222ae28d7
-yara scanS
+yrs S
 EOF
 EXPECT=<<EOF
 SHA512_Constants
@@ -34,4 +34,4 @@ SHA512_Constants
 0x0000000c: yara0_SHA512_Constants_3 : d728ae22
 0x00000010: yara0_SHA512_Constants_4 : 22ae28d7
 EOF
-RUN
+RUN
\ No newline at end of file