From 24d7e6fda465590f571d5c1aace267985ac25f5a Mon Sep 17 00:00:00 2001 From: Guo Xiao Date: Tue, 21 Jul 2015 14:14:42 +0800 Subject: [PATCH] Use exec instead of system Closes Homebrew/homebrew#41952. Signed-off-by: Xu Cheng --- Formula/bigdata.rb | 2 +- Formula/chromedriver.rb | 2 +- Formula/conserver.rb | 2 +- Formula/consul.rb | 2 +- Formula/epic5.rb | 2 +- Formula/gnu-typist.rb | 2 +- Formula/jetty.rb | 2 +- Formula/libhttpserver.rb | 2 +- Formula/nsq.rb | 8 ++++---- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Formula/bigdata.rb b/Formula/bigdata.rb index c75891459e1..0594677dd83 100644 --- a/Formula/bigdata.rb +++ b/Formula/bigdata.rb @@ -35,7 +35,7 @@ class Bigdata < Formula test do server = fork do - system bin/"bigdata" + exec bin/"bigdata" end sleep 5 Process.kill("TERM", server) diff --git a/Formula/chromedriver.rb b/Formula/chromedriver.rb index 435e727a996..0c555dc82ed 100644 --- a/Formula/chromedriver.rb +++ b/Formula/chromedriver.rb @@ -37,7 +37,7 @@ class Chromedriver < Formula test do driver = fork do - system bin/"chromedriver", + exec bin/"chromedriver", "--port=9999", "--log-path=#{testpath}/cd.log" end sleep 5 diff --git a/Formula/conserver.rb b/Formula/conserver.rb index 4ec8557c3a7..91b3b3cbe9c 100644 --- a/Formula/conserver.rb +++ b/Formula/conserver.rb @@ -18,7 +18,7 @@ class Conserver < Formula test do console = fork do - system bin/"console", "-n", "-p", "8000", "test" + exec bin/"console", "-n", "-p", "8000", "test" end sleep 1 Process.kill("TERM",console) diff --git a/Formula/consul.rb b/Formula/consul.rb index 3d6338724e4..d9d186129d9 100644 --- a/Formula/consul.rb +++ b/Formula/consul.rb @@ -170,7 +170,7 @@ class Consul < Formula test do fork do - system "#{bin}/consul", "agent", "-data-dir", "." + exec "#{bin}/consul", "agent", "-data-dir", "." end sleep 3 system "#{bin}/consul", "leave" diff --git a/Formula/epic5.rb b/Formula/epic5.rb index 2a92349f3a2..fa0764a34d7 100644 --- a/Formula/epic5.rb +++ b/Formula/epic5.rb @@ -24,7 +24,7 @@ class Epic5 < Formula test do connection = fork do - system bin/"epic5", "irc.freenode.net" + exec bin/"epic5", "irc.freenode.net" end sleep 5 Process.kill("TERM", connection) diff --git a/Formula/gnu-typist.rb b/Formula/gnu-typist.rb index 741dbe6f1ed..b802315cb93 100644 --- a/Formula/gnu-typist.rb +++ b/Formula/gnu-typist.rb @@ -29,7 +29,7 @@ class GnuTypist < Formula test do session = fork do - system bin/"gtypist", "-t", "-q", "-l", "DEMO_0", share/"gtypist/demo.typ" + exec bin/"gtypist", "-t", "-q", "-l", "DEMO_0", share/"gtypist/demo.typ" end sleep 2 Process.kill("TERM", session) diff --git a/Formula/jetty.rb b/Formula/jetty.rb index 996e3bd1452..6e70f33674a 100644 --- a/Formula/jetty.rb +++ b/Formula/jetty.rb @@ -31,7 +31,7 @@ class Jetty < Formula end test do - pid = fork { system bin/"jetty", "start" } + pid = fork { exec bin/"jetty", "start" } sleep 5 # grace time for server start begin assert_match /Jetty running pid=\d+/, shell_output("#{bin}/jetty check") diff --git a/Formula/libhttpserver.rb b/Formula/libhttpserver.rb index adbf156448b..7bd1b1dd44b 100644 --- a/Formula/libhttpserver.rb +++ b/Formula/libhttpserver.rb @@ -41,7 +41,7 @@ class Libhttpserver < Formula test do system ENV.cxx, "#{share}/examples/hello_world.cpp", "-o", "hello_world", "-lhttpserver", "-lcurl" - pid = fork { system "./hello_world" } + pid = fork { exec "./hello_world" } sleep 1 # grace time for server start begin assert_match /Hello World!!!/, shell_output("curl http://127.0.0.1:8080/hello") diff --git a/Formula/nsq.rb b/Formula/nsq.rb index 911a45612e9..21ac0d39e7a 100644 --- a/Formula/nsq.rb +++ b/Formula/nsq.rb @@ -76,19 +76,19 @@ class Nsq < Formula test do begin lookupd = fork do - system bin/"nsqlookupd" + exec bin/"nsqlookupd" end sleep 2 d = fork do - system bin/"nsqd", "--lookupd-tcp-address=127.0.0.1:4160" + exec bin/"nsqd", "--lookupd-tcp-address=127.0.0.1:4160" end sleep 2 admin = fork do - system bin/"nsqadmin", "--lookupd-http-address=127.0.0.1:4161" + exec bin/"nsqadmin", "--lookupd-http-address=127.0.0.1:4161" end sleep 2 to_file = fork do - system bin/"nsq_to_file", "--topic=test", "--output-dir=#{testpath}", + exec bin/"nsq_to_file", "--topic=test", "--output-dir=#{testpath}", "--lookupd-http-address=127.0.0.1:4161" end sleep 2