From 353cb87402b404c719af530656681fa35cd90a3d Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Sun, 30 Sep 2012 23:44:28 +0200
Subject: [PATCH] testsuite stap_run_batch don't add an extra empty argument.

commit 8c94ef made it possible to add extra arguments to stap_run_batch.
But we must make sure we don't accidentially add an extra empty argument.
Some testcases like parseok/fourteen.stp depend on @# being zero.
---
 testsuite/lib/systemtap.exp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 7d5060afe..13811915e 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -415,10 +415,20 @@ proc stap_run_batch {filename args} {
     close $file
     if [regexp -line {\#! stap (.*)} $firstbits -> stap_args] {
         verbose -log "spawn1 stap $stap_args $filename $args"
-        spawn stap $stap_args $filename $args
+        # Make sure we don't accidentially add an extra empty argument.
+        if {$args == ""} {
+            spawn stap $stap_args $filename
+        } else {
+            spawn stap $stap_args $filename $args
+        }
     } else {
         verbose -log "spawn2 $filename $args"
-        spawn $filename $args
+        # Make sure we don't accidentially add an extra empty argument.
+        if {$args == ""} {
+            spawn $filename
+        } else {
+            spawn $filename $args
+        }
     }
 
     expect {
-- 
2.43.5