Skip to content

Commit

Permalink
remove workarounds for old testsuite
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Sep 24, 2020
1 parent 5eb98ad commit d4c335d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ ENV LANG=POSIX LC_ALL=
# Remove the preinstalled yast2-core, it interferes with the built one
# when running the tests... (huh??)
RUN zypper --non-interactive rm yast2-core
RUN zypper --non-interactive in jemalloc-devel
COPY . /usr/src/app
2 changes: 0 additions & 2 deletions base/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ y2base_DEPENDENCIES = $(YAST2CORE)

y2base_LDADD = ${Y2UTIL_LIBS}

# -ljemalloc: workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883)
y2base_LDFLAGS = \
-Xlinker --whole-archive \
-ljemalloc \
$(PERL_LDFLAGS) \
$(YAST2CORE) \
-Xlinker --no-whole-archive
Expand Down
2 changes: 0 additions & 2 deletions package/yast2-core.spec
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ BuildRequires: libtool
# we have a parser
BuildRequires: bison
BuildRequires: flex
# workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883)
BuildRequires: jemalloc-devel
# incompatible change, parser.h -> parser.hh
BuildRequires: automake >= 1.12
# needed for all yast packages
Expand Down

0 comments on commit d4c335d

Please sign in to comment.