summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-04 11:28:49 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-04 11:28:49 +0100
commitc2f579a1722678799ebd1b82cd029e68f5ab4866 (patch)
tree6032d57eed2c9949df91281131b82f28cebe7705
parentccbf4563591bdcb18d9db6fce1862a5eeb7ccaa7 (diff)
php-doctrine-orm: sync with rawhide
-rw-r--r--php-doctrine-orm.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index b313239..26f38ef 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -38,7 +38,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Doctrine Object-Relational-Mapper (ORM)
Group: Development/Libraries
@@ -170,7 +170,7 @@ sed 's#$this->_em->clear();#if (isset($this->_em)) { $this->_em->clear(); }#' \
-i tests/Doctrine/Tests/OrmFunctionalTestCase.php
%endif
-%{__phpunit} --include-path ./lib:./tests -d date.timezone="UTC"
+%{__phpunit} --include-path ./lib:./tests -d date.timezone="UTC" -d memory_limit="512M"
%else
: Tests skipped
%endif
@@ -190,6 +190,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Nov 03 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.4.6-2
+- Ensure 512M of memory (instead of default 128M) so mock x86_64
+ builds pass (BZ #1159650)
+
* Tue Oct 14 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.4.6-1
- Updated to 2.4.6 (BZ #1108129)
- Manual git clone source instead of GitHub archive URL (to include tests)