Move embedding test into the test directory (JuliaLang#26123)

.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

.freebsdci.sh

@@ -45,7 +45,7 @@ test-embedding(){
  export BIN='../../tmp'
 
  mkdir -vp tmp
- gmake -C examples/embedding check
+ gmake -C test embedding
 }
 
 

.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)"

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)

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

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