[applied] test-abidiff-exit: Fix the command line passed to abidiff

Message ID 87fs8m7rqk.fsf@redhat.com
State New
Headers
Series [applied] test-abidiff-exit: Fix the command line passed to abidiff |

Commit Message

Dodji Seketeli April 26, 2023, 12:28 p.m. UTC
  Hello,

I noticed that the command line passed to abidiff in the
test-abidiff-exit.cc is getting bigger and bigger as the test runs.
This is because in the main loop that calls abidiff on each test, we
forget to reset the "headers directories" part of the command line
passed to abidiff.

Fixed thus.

	* tests/test-abidiff-exit.cc (main): Reset the headers directories
	passed to abidiff at each iteration.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 tests/test-abidiff-exit.cc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
  

Patch

diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index dafd0036..f7f1b0f9 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -934,10 +934,19 @@  main()
 	in_elfv1_path = source_dir_prefix + s->in_elfv1_path;
 	in_elfv0_debug_dir = source_dir_prefix + s->in_elfv0_debug_dir;
 	in_elfv1_debug_dir = source_dir_prefix + s->in_elfv1_debug_dir;
-	split_string(s->in_elfv0_headers_dirs, ",", in_elfv0_headers_dirs);
-	split_string(s->in_elfv1_headers_dirs, ",", in_elfv1_headers_dirs);
-	do_prefix_strings(in_elfv0_headers_dirs, source_dir_prefix);
-	do_prefix_strings(in_elfv1_headers_dirs, source_dir_prefix);
+	in_elfv0_headers_dirs.clear();
+	in_elfv1_headers_dirs.clear();
+	if (s->in_elfv0_headers_dirs && strcmp(s->in_elfv0_headers_dirs, ""))
+	  {
+	    split_string(s->in_elfv0_headers_dirs, ",", in_elfv0_headers_dirs);
+	    do_prefix_strings(in_elfv0_headers_dirs, source_dir_prefix);
+	  }
+
+	if (s->in_elfv1_headers_dirs && strcmp(s->in_elfv1_headers_dirs, ""))
+	  {
+	    split_string(s->in_elfv1_headers_dirs, ",", in_elfv1_headers_dirs);
+	    do_prefix_strings(in_elfv1_headers_dirs, source_dir_prefix);
+	  }
 
 	if (s->in_suppr_path && strcmp(s->in_suppr_path, ""))
 	  in_suppression_path = source_dir_prefix + s->in_suppr_path;