Skip to content

Commit

Permalink
undo: fix linux test runner
Browse files Browse the repository at this point in the history
  • Loading branch information
Oleksiy-Yakovenko committed Jan 31, 2024
1 parent b48fcf7 commit 494e712
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TEST_C_SOURCES=$(wildcard \
src/md5/*.c \
src/metadata/*.c \
src/scriptable/*.c \
src/undo/*.c\
src/undo/*.c \
Tests/*.c)
TEST_C_SOURCES:=$(filter-out src/main.c,$(TEST_C_SOURCES))
TEST_C_OBJS:=$(addprefix $(BUILD)/,\
Expand All @@ -74,7 +74,7 @@ GOOGLE_TEST_SOURCES=external/googletest/googletest/src/gtest-all.cc
GOOGLE_TEST_OBJS:=$(addprefix $(BUILD)/,$(notdir $(patsubst %.cc,%.o,$(GOOGLE_TEST_SOURCES))))

VPATH=src \
$(addprefix src/,scriptable ConvertUTF md5 metadata) \
$(addprefix src/,scriptable ConvertUTF md5 metadata undo) \
$(addprefix plugins/,libparser m3u mp3 nullout shellexec vfs_curl) \
$(addprefix external/,mp4p/src wcwidth googletest/googletest/src) \
shared \
Expand Down
6 changes: 3 additions & 3 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ BUILD=testbuild

BAKDIR=$STATIC_DEPS/bak
mkdir -p $BAKDIR
mv -vt $BAKDIR $STATIC_DEPS/*c++*.so*
mv -v $STATIC_DEPS/*c++*.so* $BAKDIR/

export DDB_TEST_SUITES=${@}
mkdir -p $BUILD
export LD_LIBRARY_PATH=$STATIC_DEPS
make -j --file=Tests.mk
make V=1 -j --file=Tests.mk
code=$?

mv -vt $STATIC_DEPS $BAKDIR/*c++*.so*
mv -v $BAKDIR/*c++*.so* $STATIC_DEPS/

exit $code

0 comments on commit 494e712

Please sign in to comment.