diff --git a/subversion.changes b/subversion.changes index 8759d2a..7e70a50 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 13 00:44:04 CEST 2011 - dmueller@suse.de + +- run regression tests again, but only for fsfs, as bdb + is slow and often runs out of memory + ------------------------------------------------------------------- Tue Aug 2 18:05:00 CEST 2011 - dmueller@suse.de diff --git a/subversion.spec b/subversion.spec index 9498e83..e45e905 100644 --- a/subversion.spec +++ b/subversion.spec @@ -630,16 +630,14 @@ fi rm -f %{buildroot}/var/adm/perl-modules/subversion %check -# Don't run regression tests on Factory, they take too long to complete. -# This check needs to be bumped with every release: -%if 0%{?suse_version} <= 1110 +ulimit -a # During "make check", auth-test loads DSOs at runtime and can't find # them if we don't set up LD_LIBRARY_PATH as below. export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH" # run test over ra_local (file://) -for fstype in fsfs bdb; do -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$fstype" -done +CHECK_FS_TYPE=fsfs +%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" + SVNSERVE_PIDFILE="$PWD/svnserve.pid" # hook up cleanup routine function on_exit { @@ -665,9 +663,7 @@ if [ -z "$free_port" ]; then fi # run tests over ra_svn (svn://) "$PWD/subversion/svnserve/svnserve" --listen-host 127.0.0.1 --listen-port "$free_port" --pid-file "$SVNSERVE_PIDFILE" -d -r "$PWD/subversion/tests/cmdline" -for fstype in fsfs bdb; do -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$fstype" BASE_URL="svn://127.0.0.1:$free_port" -done +%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL="svn://127.0.0.1:$free_port" || cat $RPM_SOURCE_DIR/%name*/tests.log kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %__rm "$SVNSERVE_PIDFILE" %if %with_java @@ -678,7 +674,6 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %if %with_ruby %__make check-swig-rb %endif # with_ruby -%endif # suse_version <= 1110 %clean %__rm -rf "%{buildroot}"