From 195ee2f3776681d4e4fb4f8a2fd0cdfd708c5dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy@gmail.com>
Date: Sun, 11 Sep 2011 17:14:56 +0200
Subject: [PATCH] cmd/tests: Add tests for combined CALLs/GOTOs.

---
 programs/cmd/tests/test_builtins.cmd     | 47 ++++++++++++++++++++++++
 programs/cmd/tests/test_builtins.cmd.exp | 10 ++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 88265f7744d..046e6e40ed4 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -1353,6 +1353,53 @@ if d==d goto dest4
 :dest4@space@
 echo goto with a following space worked
 
+echo ---------- Testing combined CALLs/GOTOs -----------
+echo @echo off>foo.cmd
+echo goto :eof>>foot.cmd
+echo :eof>>foot.cmd
+echo echo world>>foo.cmd
+
+echo @echo off>foot.cmd
+echo echo cheball>>foot.cmd
+echo.>>foot.cmd
+echo call :bar>>foot.cmd
+echo if "%%1"=="deleteMe" (del foot.cmd)>>foot.cmd
+echo goto :eof>>foot.cmd
+echo.>>foot.cmd
+echo :bar>>foot.cmd
+echo echo barbare>>foot.cmd
+echo goto :eof>>foot.cmd
+
+call foo.cmd
+call foot
+call :bar
+del foo.cmd
+rem Script execution stops after the following line
+foot deleteMe
+call :foo
+call :foot
+goto :endFuns
+
+:foot
+echo foot
+
+:foo
+echo foo
+goto :eof
+
+:endFuns
+
+:bar
+echo bar
+call :foo
+
+:baz
+echo baz
+goto :eof
+
+echo Final message is not output since earlier 'foot' processing stops script execution
+echo Do NOT add any tests below this line
+
 echo -----------Done, jumping to EOF-----------
 goto :eof
 rem Subroutine to set errorlevel and return
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index b9285b16eed..1e2e3df24d2 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -757,4 +757,12 @@ goto with no leading space worked
 goto with a leading space worked
 goto with a leading tab worked
 goto with a following space worked
------------Done, jumping to EOF-----------
+---------- Testing combined CALLs/GOTOs -----------
+world
+cheball
+barbare
+bar
+foo
+baz
+cheball
+barbare