[sagemath] 01/01: More test fixes
Ximin Luo
infinity0 at debian.org
Fri Aug 11 18:57:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit 3f07c6836591678082bf724d0ad7aef79d9c0e68
Author: Ximin Luo <infinity0 at debian.org>
Date: Fri Aug 11 20:57:05 2017 +0200
More test fixes
---
debian/patches/d0-threejs-offline-paths.patch | 7 +++--
debian/patches/d1-sage-cli.patch | 34 ++++++++++------------
debian/patches/series | 1 +
.../u2-workaround-sympow-malloc-perturb.patch | 16 ++++++++++
debian/rules | 2 ++
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/debian/patches/d0-threejs-offline-paths.patch b/debian/patches/d0-threejs-offline-paths.patch
index d2fcde4..15bceef 100644
--- a/debian/patches/d0-threejs-offline-paths.patch
+++ b/debian/patches/d0-threejs-offline-paths.patch
@@ -15,9 +15,12 @@
IFRAME_TEMPLATE = \
-@@ -590,12 +589,7 @@
+@@ -588,14 +587,9 @@
+ sage: from sage.repl.rich_output.backend_ipython import BackendIPythonNotebook
+ sage: backend = BackendIPythonNotebook()
sage: backend.threejs_offline_scripts()
- '...<script src="/nbextensions/threejs/three.min...<\\/script>...'
+- '...<script src="/nbextensions/threejs/three.min...<\\/script>...'
++ '...<script src="/nbextensions/threejs/three.min...</script>...'
"""
- from sage.repl.rich_output import get_display_manager
- CDN_scripts = get_display_manager().threejs_scripts(online=True)
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index 63fdd14..dc7f464 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -259,7 +259,7 @@ Forwarded: not-needed
#####################################################################
# Source sage-env ($0 is the name of this "sage" script, so we can just
-@@ -385,29 +223,10 @@
+@@ -385,29 +223,9 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -273,13 +273,11 @@ Forwarded: not-needed
- echo >&2 'a binary tarball instead. Read README.txt for more information.'
- echo >&2 '************************************************************************'
- exit 1
-+ if [ "$SAGE_BANNER" != "no" ]; then
-+ cat "/usr/share/sagemath/bin/sage-banner"
- fi
-
-- # Display the startup banner (unless SAGE_BANNER is explicitly "no")
-- sage_banner
+- fi
-
+ # Display the startup banner (unless SAGE_BANNER is explicitly "no")
+ sage_banner
+
- maybe_sage_location
-
- if [ ! -d "$IPYTHONDIR" ]; then
@@ -291,7 +289,7 @@ Forwarded: not-needed
sage-cleaner &>/dev/null &
}
-@@ -485,11 +304,6 @@
+@@ -485,11 +303,6 @@
exec gap "$@"
fi
@@ -303,7 +301,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -535,11 +349,6 @@
+@@ -535,11 +348,6 @@
exec kash "$@"
fi
@@ -315,7 +313,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -555,21 +364,6 @@
+@@ -555,21 +363,6 @@
exec M2 "$@"
fi
@@ -337,7 +335,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -600,11 +394,6 @@
+@@ -600,11 +393,6 @@
exec git "$@"
fi
@@ -349,7 +347,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -724,20 +513,6 @@
+@@ -724,20 +512,6 @@
fi
#####################################################################
@@ -370,7 +368,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -760,11 +535,6 @@
+@@ -760,11 +534,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -382,7 +380,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -775,13 +545,6 @@
+@@ -775,13 +544,6 @@
exec sage-notebook "$@"
fi
@@ -396,7 +394,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -800,34 +563,15 @@
+@@ -800,34 +562,15 @@
exit 0
fi
@@ -433,7 +431,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -836,16 +580,6 @@
+@@ -836,16 +579,6 @@
fi
fi
@@ -450,7 +448,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -860,114 +594,6 @@
+@@ -860,114 +593,6 @@
exec sage-eval "$@"
fi
@@ -565,7 +563,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -1039,10 +665,6 @@
+@@ -1039,10 +664,6 @@
fi
if [ $# -ge 1 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index cd3d7a4..75ee6c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@ u2-fix-trivial-test-cases.patch
u2-fix-less-trivial-test-cases.patch
u2-fix-sympow-cachedir.patch
u2-allow-override-sage-local.patch
+u2-workaround-sympow-malloc-perturb.patch
# Patch Sage to work with dependency Debian packages
# These won't change even if Debian and Sage use the same version
diff --git a/debian/patches/u2-workaround-sympow-malloc-perturb.patch b/debian/patches/u2-workaround-sympow-malloc-perturb.patch
new file mode 100644
index 0000000..73ec3a9
--- /dev/null
+++ b/debian/patches/u2-workaround-sympow-malloc-perturb.patch
@@ -0,0 +1,16 @@
+Description: Work around sympow segfault due to MALLOC_PERTURB_
+Author: Ximin Luo <infinity0 at debian.org>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863919
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/src/sage/lfunctions/sympow.py
++++ b/sage/src/sage/lfunctions/sympow.py
+@@ -77,7 +77,7 @@ class Sympow(SageObject):
+ """
+ Used to call sympow with given args
+ """
+- cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args)
++ cmd = 'env -u MALLOC_PERTURB_ SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args)
+ v = os.popen(cmd).read().strip()
+ verbose(v, level=2)
+ return v
diff --git a/debian/rules b/debian/rules
index e7c9fab..cb2a8b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ endif
export SAGE_LOCAL = $(CURDIR)/debian/build/usr
export PYTHONPATH = $(CURDIR)/debian/build/usr/lib/python2.7/dist-packages
export DOT_SAGE = $(CURDIR)/debian/test
+export SAGE_SCRIPTS_DIR = $(CURDIR)/sage/src/bin
LANGS = $(shell cd sage/src/doc && find . -mindepth 1 -maxdepth 1 -type d | grep -v common | cut -b3- | LC_ALL=C.UTF-8 LANG=C.UTF-8 sort)
DOCS_INSTALL = $(LANGS:%=debian/sagemath-doc-%.install)
@@ -50,6 +51,7 @@ export-build-env:
@echo export SAGE_LOCAL=$(SAGE_LOCAL)
@echo export PYTHONPATH=$(PYTHONPATH)
@echo export DOT_SAGE=$(DOT_SAGE)
+ @echo export SAGE_SCRIPTS_DIR=$(SAGE_SCRIPTS_DIR)
debian/control: debian/control.in $(DOCS_CONTROL)
cat $^ > "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list