Skip to content

Commit

Permalink
make sure bootstrap-test-env can be used multiple times
Browse files Browse the repository at this point in the history
  • Loading branch information
allanpaiste committed Feb 24, 2021
1 parent 293a8ac commit c8b1039
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/analyse
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi

if [ "${type}" == "" ] || [ "${type}" == "phpcpd" ] ; then
echo ">>> phpcpd"
vendor/bin/phpcpd src
vendor/bin/phpcpd src modules

result=${?}

Expand Down
1 change: 1 addition & 0 deletions bin/bootstrap-test-env
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ COPYRIGHT

# Setup sandbox
name='composer-patches'
rm -rf test/modules/${name} 2>/dev/null
mkdir -p test/modules/${name} 2>/dev/null

if [ ! -L test/modules/${name}/src ] ; then
Expand Down
1 change: 1 addition & 0 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ assert_scenario_output() {
|grep -v "^Nothing to install, update or remove" \
|grep -v "^Updating dependencies" \
|grep -v "^Nothing to modify in lock file" \
|grep -v "^Warning: The lock file is not up to date with the latest changes in" \
|sed 's/ *$//g' \
> output.txt

Expand Down
2 changes: 1 addition & 1 deletion test/installations/package-using-file/.label
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Using patches.json that has been defined in the ROOT composer.json
Using patches.json that has been defined in the PACKAGE composer.json
2 changes: 1 addition & 1 deletion test/installations/package-using-search/.label
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Using patches.json that has been defined in the ROOT composer.json
Using patches.json that has been defined in the PACKAGE composer.json
2 changes: 1 addition & 1 deletion test/scenarios/root-branch-alias/.label
Original file line number Diff line number Diff line change
@@ -1 +1 @@
one patch applied
one patch applied for root package that has branch alias

0 comments on commit c8b1039

Please sign in to comment.