Skip to content

Commit

Permalink
Improving output of setup tasks. (#617)
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash authored Nov 1, 2016
1 parent 7ac3788 commit fdb2c1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<target name="setup:behat" description="Generates tests/behat/local.yml file for executing Behat tests locally.">
<mkdir dir="${reports.localDir}/behat"/>
<echo>Attempting to generate tests/behat/local.yml.</echo>
<echo level="${blt.level}">Attempting to generate tests/behat/local.yml.</echo>
<copy file="${repo.root}/tests/behat/example.local.yml" tofile="${repo.root}/tests/behat/local.yml" verbose="true">
<filterchain>
<expandproperties level="verbose" />
Expand Down
2 changes: 1 addition & 1 deletion phing/tasks/tests.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<if>
<equals arg1="${behat.launch-selenium}" arg2="true"/>
<then>
<echo>Killing any selenium processes that are already running.</echo>
<phingcall target="tests:selenium:kill"/>
<echo message="Launching Selenium standalone server." />
<touch file="${repo.root}/reports/selenium2.log"/>
Expand Down Expand Up @@ -144,6 +143,7 @@

<target name="tests:selenium:kill"
description="Kills Selenium standalone server process and any process running on port 4444." hidden="true">
<echo>Killing any selenium processes that are already running.</echo>
<exec command="lsof -ti tcp:4444 | xargs kill" logoutput="false" level="${blt.exec_level}" passthru="false" checkreturn="false" />
<exec command="pgrep selenium | xargs kill" logoutput="false" level="${blt.exec_level}" passthru="false" checkreturn="false" />
</target>
Expand Down

0 comments on commit fdb2c1d

Please sign in to comment.