From 8934c4e44f56e4088fb5b35f0f26435a29f3d00f Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Mon, 19 Feb 2018 13:41:19 -0800 Subject: [PATCH] Move embedding test into the test directory --- .circleci/config.yml | 2 +- .freebsdci.sh | 2 +- .travis.yml | 2 +- Makefile | 6 ++---- appveyor.yml | 2 +- test/Makefile | 8 +++++++- {examples => test}/embedding/.gitignore | 0 {examples => test}/embedding/LocalModule.jl | 0 {examples => test}/embedding/Makefile | 0 {examples => test}/embedding/embedding-test.jl | 0 {examples => test}/embedding/embedding.c | 0 11 files changed, 13 insertions(+), 9 deletions(-) rename {examples => test}/embedding/.gitignore (100%) rename {examples => test}/embedding/LocalModule.jl (100%) rename {examples => test}/embedding/Makefile (100%) rename {examples => test}/embedding/embedding-test.jl (100%) rename {examples => test}/embedding/embedding.c (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d22e174d1fc2..4ebc37794c922 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: /tmp/julia/bin/julia --check-bounds=yes runtests.jl LibGit2/online Pkg/pkg download && popd && mkdir /tmp/embedding-test && - make check -C /tmp/julia/share/doc/julia/examples/embedding \ + make check -C /tmp/julia/share/julia/test/embedding \ JULIA=/tmp/julia/bin/julia BIN=/tmp/embedding-test \ "$(cd julia-src && make print-CC)" && mv julia-src project diff --git a/.freebsdci.sh b/.freebsdci.sh index 30db2539e27bd..7322d01a705af 100755 --- a/.freebsdci.sh +++ b/.freebsdci.sh @@ -45,7 +45,7 @@ test-embedding(){ export BIN='../../tmp' mkdir -vp tmp - gmake -C examples/embedding check + gmake -C test embedding } diff --git a/.travis.yml b/.travis.yml index c436281ea16e7..58940dfe8020e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,7 +148,7 @@ script: - popd # test that the embedding code works on our installation - mkdir /tmp/embedding-test && - make check -C /tmp/julia/share/doc/julia/examples/embedding \ + make check -C /tmp/julia/share/julia/test/embedding \ JULIA="/tmp/julia/bin/julia" \ BIN=/tmp/embedding-test \ "$(cd julia2 && make print-CC)" diff --git a/Makefile b/Makefile index e2f2be1c829f1..5a0fa8dd62270 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ all: debug release # sort is used to remove potential duplicates DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_includedir) $(build_includedir)/julia $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_datarootdir)/julia/site $(build_man1dir)) ifneq ($(BUILDROOT),$(JULIAHOME)) -BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src ui doc deps test test/perf examples examples/embedding) +BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src ui doc deps test test/embedding test/perf examples) BUILDDIRMAKE := $(addsuffix /Makefile,$(BUILDDIRS)) DIRS := $(DIRS) $(BUILDDIRS) $(BUILDDIRMAKE): | $(BUILDDIRS) @@ -62,14 +62,12 @@ clean-docdir: @-rm -fr $(abspath $(build_docdir)) $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/examples/*.jl) \ - $(shell find $(JULIAHOME)/examples/clustermanager) \ - $(shell find $(JULIAHOME)/examples/embedding) + $(shell find $(JULIAHOME)/examples/clustermanager) @echo Copying in usr/share/doc/julia/examples @-rm -fr $(build_docdir)/examples @mkdir -p $(build_docdir)/examples @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/ @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/ - @cp -R $(JULIAHOME)/examples/embedding $(build_docdir)/examples @echo 1 > $@ julia-symlink: julia-ui-$(JULIA_BUILD_MODE) diff --git a/appveyor.yml b/appveyor.yml index 6a51128ec571f..514c1cb50e64b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,4 +57,4 @@ test_script: - cd julia-* && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl all && .\bin\julia.exe --check-bounds=yes share\julia\test\runtests.jl LibGit2/online Pkg/pkg download - cd .. - - usr\bin\julia usr\share\doc\julia\examples\embedding\embedding-test.jl examples\embedding\embedding.exe + - usr\bin\julia usr\share\julia\test\embedding\embedding-test.jl test\embedding\embedding.exe diff --git a/test/Makefile b/test/Makefile index 95ba3115fc27c..599c4cff2fe12 100644 --- a/test/Makefile +++ b/test/Makefile @@ -14,16 +14,22 @@ TESTS = all stdlib $(TESTGROUPS) \ $(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/$(group)/*.jl))) # run `make print-TESTS` to see a list of all tests that can be run +EMBEDDING_ARGS := JULIA=$(JULIA_EXECUTABLE) BIN=$(SRCDIR)/embedding + default: all $(TESTS): @cd $(SRCDIR) && \ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl $@) +embedding: + @$(MAKE) -C $(SRCDIR)/$@ check $(EMBEDDING_ARGS) + perf: @$(MAKE) -C $(SRCDIR)/perf all clean: + @$(MAKE) -C embedding $@ $(EMBEDDING_ARGS) @$(MAKE) -C perf $@ -.PHONY: $(TESTS) perf clean +.PHONY: $(TESTS) embedding perf clean diff --git a/examples/embedding/.gitignore b/test/embedding/.gitignore similarity index 100% rename from examples/embedding/.gitignore rename to test/embedding/.gitignore diff --git a/examples/embedding/LocalModule.jl b/test/embedding/LocalModule.jl similarity index 100% rename from examples/embedding/LocalModule.jl rename to test/embedding/LocalModule.jl diff --git a/examples/embedding/Makefile b/test/embedding/Makefile similarity index 100% rename from examples/embedding/Makefile rename to test/embedding/Makefile diff --git a/examples/embedding/embedding-test.jl b/test/embedding/embedding-test.jl similarity index 100% rename from examples/embedding/embedding-test.jl rename to test/embedding/embedding-test.jl diff --git a/examples/embedding/embedding.c b/test/embedding/embedding.c similarity index 100% rename from examples/embedding/embedding.c rename to test/embedding/embedding.c