diff --git a/src/Makefile.am b/src/Makefile.am index e56a8a2..4adcc48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = $(top_builddir)/bin/vsearch if TARGET_PPC AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -mcpu=power8 else -AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -march=x86-64 -mtune=generic +AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -lcityhash endif AM_CFLAGS=$(AM_CXXFLAGS) @@ -18,8 +18,6 @@ allpairs.h \ arch.h \ bitmap.h \ chimera.h \ -city.h \ -citycrc.h \ cluster.h \ cpu.h \ db.h \ @@ -59,31 +57,26 @@ xstring.h if TARGET_PPC libcpu_a_SOURCES = cpu.cc $(VSEARCHHEADERS) -noinst_LIBRARIES = libcpu.a libcityhash.a +noinst_LIBRARIES = libcpu.a else libcpu_sse2_a_SOURCES = cpu.cc $(VSEARCHHEADERS) libcpu_sse2_a_CXXFLAGS = $(AM_CXXFLAGS) -msse2 libcpu_ssse3_a_SOURCES = cpu.cc $(VSEARCHHEADERS) libcpu_ssse3_a_CXXFLAGS = $(AM_CXXFLAGS) -mssse3 -DSSSE3 -noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a libcityhash.a +noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a endif -libcityhash_a_SOURCES = city.cc city.h - if TARGET_WIN -libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare -D_MSC_VER -__top_builddir__bin_vsearch_LDFLAGS = -static -__top_builddir__bin_vsearch_LDADD = libregex.a libcityhash.a libcpu_ssse3.a libcpu_sse2.a +__top_builddir__bin_vsearch_LDFLAGS = -static -lcityhash +__top_builddir__bin_vsearch_LDADD = libregex.a libcpu_ssse3.a libcpu_sse2.a else -libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare - if TARGET_PPC -__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu.a +__top_builddir__bin_vsearch_LDADD = libcpu.a else -__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu_ssse3.a libcpu_sse2.a +__top_builddir__bin_vsearch_LDADD = libcpu_ssse3.a libcpu_sse2.a endif endif diff --git a/src/vsearch.h b/src/vsearch.h index f2c244b..5f51bbe 100644 --- a/src/vsearch.h +++ b/src/vsearch.h @@ -148,7 +148,7 @@ #include #endif -#include "city.h" +#include #include "md5.h" #include "sha1.h" ix/log/tests?id=4469990f2e4b300781c93dfd41a82c41611842e3'>tests/keys
l'>...* tests/texlive.scm ("texlive->guix-package"): Correct order of locations.
AgeCommit message (Expand)Author
2021-12-22tests: Move keys into ./tests/keys/ and add a third ed25519 key....The third key will be used in an upcoming commit. Rename public keys to .pub. * guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable. (%ed25519-3-secret-key-file): New variable. (%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file. (%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file. * tests/keys/ed25519-3.key: New file. * tests/keys/ed25519-3.sec: New file. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Attila Lendvai
Ricardo Wurmus
2021-11-18tests: Replace texlive importer tests....* tests/texlive.scm (xml, sxml): Remove variables. ("fetch-sxml: returns SXML for valid XML", "sxml->package"): Remove tests. ("texlive->guix-package"): Add new test. Ricardo Wurmus
2021-03-06tests: do not hard code HTTP ports...Previously, test cases could fail if some process was listening at a hard-coded port. This patch eliminates most of these potential failures, by automatically assigning an unbound port. This should allow for building multiple guix trees in parallel outside a build container, though this is currently untested. The test "home-page: Connection refused" in tests/lint.scm still hardcodes port 9999, however. * guix/tests/http.scm (http-server-can-listen?): remove now unused procedure. (%http-server-port): default to port 0, meaning the OS will automatically choose a port. (open-http-server-socket): remove the false statement claiming this procedure is exported and also return the allocated port number. (%local-url): raise an error if the port is obviously unbound. (call-with-http-server): set %http-server-port to the allocated port while the thunk is called. * tests/derivations.scm: adjust test cases to use automatically assign a port. As there is no risk of a port conflict now, do not make any tests conditional upon 'http-server-can-listen?' anymore. * tests/elpa.scm: likewise. * tests/lint.scm: likewise, and add a TODO comment about a port that is still hard-coded. * tests/texlive.scm: likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Maxime Devos
2020-01-17import: texlive: Avoid uses of '@@' in tests....* guix/import/texlive.scm (fetch-sxml, sxml->package): Export. * tests/texlive.scm <top level>: Call '%http-server-port'. ("fetch-sxml: returns SXML for valid XML"): Use 'with-http-server' and set 'current-http-proxy' instead of using 'mock'. ("sxml->package"): Remove use of '@@'. Ludovic Courtès