summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2018-12-05 10:34:35 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2018-12-05 10:34:37 +0900
commit2a39bfafabd4eafec86f6a36bac801590699b526 (patch)
tree824d2e14babc323a2244f72a9ed5be560cb60a01 /Makefile
parentcdc7d1622945b5442057ec24743c3546fcdec3e7 (diff)
downloadre2-2a39bfafabd4eafec86f6a36bac801590699b526.tar.gz
re2-2a39bfafabd4eafec86f6a36bac801590699b526.tar.bz2
re2-2a39bfafabd4eafec86f6a36bac801590699b526.zip
Imported Upstream version 20180401upstream/20180401
Change-Id: Ide1deac14b8ce8ffa4ea33ec60597be59083705b Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 7 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 1c04cb9..6836e06 100644
--- a/Makefile
+++ b/Makefile
@@ -246,22 +246,13 @@ testofiles: $(TESTOFILES)
test: $(DTESTS) $(TESTS) $(STESTS) debug-test static-test shared-test
debug-test: $(DTESTS)
- @echo
- @echo Running debug binary tests.
- @echo
@./runtests $(DTESTS)
static-test: $(TESTS)
- @echo
- @echo Running static binary tests.
- @echo
@./runtests $(TESTS)
shared-test: $(STESTS)
- @echo
- @echo Running dynamic binary tests.
- @echo
- @LD_LIBRARY_PATH=obj/so:$(LD_LIBRARY_PATH) ./runtests $(STESTS)
+ @./runtests -shared-library-path obj/so $(STESTS)
debug-bigtest: $(DTESTS) $(DBIGTESTS)
@./runtests $(DTESTS) $(DBIGTESTS)
@@ -270,7 +261,7 @@ static-bigtest: $(TESTS) $(BIGTESTS)
@./runtests $(TESTS) $(BIGTESTS)
shared-bigtest: $(STESTS) $(SBIGTESTS)
- @LD_LIBRARY_PATH=obj/so:$(LD_LIBRARY_PATH) ./runtests $(STESTS) $(SBIGTESTS)
+ @./runtests -shared-library-path obj/so $(STESTS) $(SBIGTESTS)
benchmark: obj/test/regexp_benchmark
@@ -314,7 +305,11 @@ shared-testinstall:
@mkdir -p obj
@cp testinstall.cc obj
(cd obj && $(CXX) testinstall.cc -o testinstall $(CXXFLAGS) $(LDFLAGS))
- LD_LIBRARY_PATH=$(DESTDIR)$(libdir) obj/testinstall
+ifeq ($(shell uname),Darwin)
+ DYLD_LIBRARY_PATH="$(DESTDIR)$(libdir):$(DYLD_LIBRARY_PATH)" obj/testinstall
+else
+ LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$(LD_LIBRARY_PATH)" obj/testinstall
+endif
benchlog: obj/test/regexp_benchmark
(echo '==BENCHMARK==' `hostname` `date`; \