From 67a662f1c68a10cf6c5d6cb2fe3f780c7042fc65 Mon Sep 17 00:00:00 2001
From: Johan Holmberg <holmberg556@gmail.com>
Date: Thu, 17 Nov 2016 10:30:29 +0100
Subject: [PATCH] use env.rb and grep.rb in test

to avoid depending on some env.exe and grep.exe
on Windows.
---
 t/CMDTEST_setenv.rb | 30 +++++++++++++++++-------------
 t/bin/env.rb        |  6 ++++++
 t/bin/grep.rb       | 13 +++++++++++++
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100755 t/bin/env.rb
 create mode 100755 t/bin/grep.rb

diff --git a/t/CMDTEST_setenv.rb b/t/CMDTEST_setenv.rb
index e27d560..3b45862 100644
--- a/t/CMDTEST_setenv.rb
+++ b/t/CMDTEST_setenv.rb
@@ -9,34 +9,36 @@ class CMDTEST_setenv < Cmdtest::Testcase
   def test_setenv
     #----------
     create_CMDTEST_foo [
-      'cmd "env | grep TESTVAR1" do',
-      '  exit_nonzero', # no match in grep
+      'cmd "env.rb | grep.rb TESTVAR1" do',
+      '  exit_nonzero', # no match in grep.rb
       'end',
     ]
     cmd_cmdtest do
       comment "TESTVAR1 not set"
       stdout_equal [
-        "### env | grep TESTVAR1",
+        "### env.rb | grep.rb TESTVAR1",
       ]
     end
 
     #----------
     create_CMDTEST_foo [
       'setenv "TESTVAR1", "123456"',
-      'cmd "env | grep TESTVAR1" do',
+      'cmd "env.rb | grep.rb TESTVAR1" do',
       '  stdout_equal "TESTVAR1=123456\\n"',
       'end',
     ]
     cmd_cmdtest do
       comment "TESTVAR1 set by setenv"
       stdout_equal [
-        "### env | grep TESTVAR1",
+        "### env.rb | grep.rb TESTVAR1",
       ]
     end
 
-    cmd("env | grep TESTVAR1") do
+    prepend_path 't/bin'
+
+    cmd("env.rb | grep.rb TESTVAR1") do
       comment "TESTVAR1 still unset on level1"
-      exit_nonzero # no match in grep
+      exit_nonzero # no match in grep.rb
     end
   end
 
@@ -46,32 +48,34 @@ class CMDTEST_setenv < Cmdtest::Testcase
     ENV['TESTVAR2'] = '987654'
     #----------
     create_CMDTEST_foo [
-      'cmd "env | grep TESTVAR2" do',
+      'cmd "env.rb | grep.rb TESTVAR2" do',
       '  stdout_equal "TESTVAR2=987654\\n"',
       'end',
     ]
     cmd_cmdtest do
       comment "TESTVAR2 set from start"
       stdout_equal [
-        "### env | grep TESTVAR2",
+        "### env.rb | grep.rb TESTVAR2",
       ]
     end
 
     #----------
     create_CMDTEST_foo [
       'unsetenv "TESTVAR2"',
-      'cmd "env | grep TESTVAR2" do',
-      '  exit_nonzero', # no match in grep
+      'cmd "env.rb | grep.rb TESTVAR2" do',
+      '  exit_nonzero', # no match in grep.rb
       'end',
     ]
     cmd_cmdtest do
       comment "TESTVAR2 unset by unsetenv"
       stdout_equal [
-        "### env | grep TESTVAR2",
+        "### env.rb | grep.rb TESTVAR2",
       ]
     end
 
-    cmd("env | grep TESTVAR2") do
+    prepend_path 't/bin'
+
+    cmd("env.rb | grep.rb TESTVAR2") do
       comment "TESTVAR2 still set on level1"
       stdout_equal [
         "TESTVAR2=987654",
diff --git a/t/bin/env.rb b/t/bin/env.rb
new file mode 100755
index 0000000..297580a
--- /dev/null
+++ b/t/bin/env.rb
@@ -0,0 +1,6 @@
+#!/usr/bin/ruby
+
+for k in ENV.keys.sort
+    puts("%s=%s" % [k, ENV[k]])
+end
+
diff --git a/t/bin/grep.rb b/t/bin/grep.rb
new file mode 100755
index 0000000..d03f7b7
--- /dev/null
+++ b/t/bin/grep.rb
@@ -0,0 +1,13 @@
+#!/usr/bin/ruby
+
+pattern = Regexp.new(ARGV[0])
+
+n = 0
+for line in STDIN
+    if line =~ pattern
+	puts line
+	n += 1
+    end
+end
+
+exit(n == 0 ? 1 : 0)