Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving output of setup tasks. #617

Merged
merged 1 commit into from
Nov 1, 2016
+2 −2
Merged

Improving output of setup tasks. #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
View file
Open in desktop
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
View file
Open in desktop
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