[med-svn] [seqan2] 01/01: New upstream version 2.3.2.000platform-issues7-41f58c3+dfsg
Michael Crusoe
misterc-guest at moszumanska.debian.org
Wed Dec 6 13:23:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
misterc-guest pushed a commit to annotated tag upstream/2.3.2.000platform-issues7-41f58c3+dfsg
in repository seqan2.
commit 40a4649d7c580dbd241d511ad160420f788a8204
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date: Tue Nov 21 22:15:13 2017 -0800
New upstream version 2.3.2.000platform-issues7-41f58c3+dfsg
---
apps/searchjoin/tests/run_tests.py | 6 ++++++
apps/yara/tests/run_tests.py | 7 ++++---
include/seqan/platform.h | 6 +-----
tests/bam_io/test_bam_sam_conversion.h | 13 ++++++-------
tests/index/test_index_fm_rank_dictionary.cpp | 7 ++++++-
5 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/apps/searchjoin/tests/run_tests.py b/apps/searchjoin/tests/run_tests.py
index 6e347bb..aef16ef 100644
--- a/apps/searchjoin/tests/run_tests.py
+++ b/apps/searchjoin/tests/run_tests.py
@@ -13,6 +13,7 @@ import logging
import os.path
import sys
import glob
+import platform
# Automagically add util/py_lib to PYTHONPATH environment variable.
path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
@@ -29,6 +30,11 @@ transforms = [
def main(source_base, binary_base):
"""Main entry point of the script."""
+ if platform.machine().startswith('alpha'):
+ print 'Skipping tests for searchjoin on alpha'
+ print '======================================'
+ return 0
+
print 'Executing test for searchjoin'
print '==========================='
print
diff --git a/apps/yara/tests/run_tests.py b/apps/yara/tests/run_tests.py
index fd518a5..db6d921 100644
--- a/apps/yara/tests/run_tests.py
+++ b/apps/yara/tests/run_tests.py
@@ -13,6 +13,7 @@ import logging
import os.path
import sys
import glob
+import platform
# Automagically add util/py_lib to PYTHONPATH environment variable.
path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
@@ -34,9 +35,9 @@ def main(source_base, binary_base):
"""Main entry point of the script."""
# gold standard binary files created on little endian
- if sys.byteorder != 'little':
- print 'Skipping tests for Yara on big endian'
- print '====================================='
+ if sys.byteorder != 'little' or platform.machine().startswith('mips64'):
+ print 'Skipping tests for Yara on big endian and mips64el'
+ print '=================================================='
return 0
print 'Executing test for Yara'
diff --git a/include/seqan/platform.h b/include/seqan/platform.h
index 5bf0f5b..40ab71f 100644
--- a/include/seqan/platform.h
+++ b/include/seqan/platform.h
@@ -534,11 +534,7 @@ inline void ensure_little_endian(double & in)
// DEFAULT PAGESIZE FOR MMAP
#ifndef SEQAN_DEFAULT_PAGESIZE
- #if SEQAN_IS_64_BIT || defined(__powerpc__)
- #define SEQAN_DEFAULT_PAGESIZE 64 * 1024
- #else
- #define SEQAN_DEFAULT_PAGESIZE 4 * 1024
- #endif
+ #define SEQAN_DEFAULT_PAGESIZE 64 * 1024
#endif
#endif // HEADER GUARD
diff --git a/tests/bam_io/test_bam_sam_conversion.h b/tests/bam_io/test_bam_sam_conversion.h
index 176c121..ac71e2b 100644
--- a/tests/bam_io/test_bam_sam_conversion.h
+++ b/tests/bam_io/test_bam_sam_conversion.h
@@ -132,8 +132,9 @@ SEQAN_DEFINE_TEST(test_assign_tags_bam_to_sam_type_f)
arrayCopy(DATA, DATA + 7, &bamTags[0]);
CharString samTags;
assignTagsBamToSam(samTags, bamTags);
- // we don't assert equality, because of floating point madness
- SEQAN_ASSERT(startsWith(CharString(samTags), CharString("XX:f:0.5")));
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86) // floaing point madness
+ SEQAN_ASSERT_EQ(CharString("XX:f:0.5"), CharString(samTags));
+#endif
}
SEQAN_DEFINE_TEST(test_assign_tags_bam_to_sam_type_Z)
@@ -250,9 +251,7 @@ SEQAN_DEFINE_TEST(test_assign_tags_bam_to_sam_type_Bf)
arrayCopy(DATA, DATA + 16, &bamTags[0]);
CharString samTags;
assignTagsBamToSam(samTags, bamTags);
-#if SEQAN_BIG_ENDIAN // floaing point madness
- SEQAN_ASSERT(startsWith(CharString(samTags), CharString("XX:B:f,0.5")));
-#else
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86) // floaing point madness
SEQAN_ASSERT_EQ(CharString("XX:B:f,0.5,0.5"), CharString(samTags));
#endif
}
@@ -298,7 +297,7 @@ SEQAN_DEFINE_TEST(test_assign_tags_sam_to_bam_type_f)
resize(expected, 7);
char const * DATA = "XXf\x00\x00\x00\x3f";
arrayCopy(DATA, DATA + 7, begin(expected, Standard()));
-#if !SEQAN_BIG_ENDIAN // floating point madness
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86) // floaing point madness
SEQAN_ASSERT_EQ(expected, CharString(bamTags));
#endif
}
@@ -426,7 +425,7 @@ SEQAN_DEFINE_TEST(test_assign_tags_sam_to_bam_type_Bf)
resize(expected, 16);
char const * DATA = "XXBf\2\0\0\0\x00\x00\x00\x3f\x00\x00\x00\x3f";
arrayCopy(DATA, DATA + 16, begin(expected, Standard()));
-#if !SEQAN_BIG_ENDIAN
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86) // floaing point madness
SEQAN_ASSERT_EQ(expected, CharString(bamTags));
#endif
}
diff --git a/tests/index/test_index_fm_rank_dictionary.cpp b/tests/index/test_index_fm_rank_dictionary.cpp
index a598235..0266a82 100644
--- a/tests/index/test_index_fm_rank_dictionary.cpp
+++ b/tests/index/test_index_fm_rank_dictionary.cpp
@@ -122,9 +122,14 @@ typedef
TagList<RankDictionary<Dna5, Default3Level>,
TagList<RankDictionary<Dna5Q, Default3Level>,
TagList<RankDictionary<ReducedMurphy10, Default3Level>,
+#ifndef __alpha__ // NOTE(h-2): fails on alpha for unknown reasons
TagList<RankDictionary<AminoAcid, Default3Level>,
+#endif
RankDictionaryPrefixSumTypes
- > > > > > > > > > > > > > > > > > > >
+ > > > > > > > > > > > > > > > > > >
+#ifndef __alpha__
+ >
+#endif
RankDictionaryAllTypes;
// ==========================================================================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seqan2.git
More information about the debian-med-commit
mailing list