Merge #32

32: doc(godoc) Move examples in the root directory… r=Hywan a=Hywan … so that I hope godoc will found them. Co-authored-by: Ivan Enderlin <[email protected]>
wasmerio · Jun 5, 2019 · fa4e858 · fa4e858
2 parents 2dabb45 + 73cc350
commit fa4e858
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/justfile b/justfile
@@ -37,13 +37,13 @@ debug-cgo:
 test:
 	#!/usr/bin/env bash
 	#export DYLD_PRINT_LIBRARIES=y
-	cd wasmer/test/
+	cd wasmer
 	# Run the tests.
-	GODEBUG=cgocheck=2 go test -test.v $(find . -type f \( -name "*_test.go" \! -name "example_*.go" \! -name "benchmark*.go" \) ) imports.go
+	GODEBUG=cgocheck=2 go test -test.v $(find test -type f \( -name "*_test.go" \! -name "example_*.go" \! -name "benchmark*.go" \) ) test/imports.go
 	# Run the short examples.
 	go test -test.v example_test.go
 	# Run the long examples.
-	go test -test.v $(find . -type f \( -name "example_*_test.go" \! -name "example_import_test.go" \) )
+	go test -test.v $(find . -type f \( -name "example_*_test.go" \! -name "_example_import_test.go" \) )
 
 # Run benchmarks. Subjects can be `wasmer`, `wagon` or `life`. Filter is a regex to select the benchmarks.
 bench subject='wagon' filter='.*':

diff --git a/wasmer/test/example_import_test.go → wasmer/_example_import_test.go b/wasmer/test/example_import_test.go → wasmer/_example_import_test.go
@@ -1,4 +1,4 @@
-package wasmer_test
+package wasmertest
 
 // // 1️⃣ Declare the `sum` function signature (see [cgo](https://golang.org/cmd/cgo/)).
 //
@@ -17,7 +17,7 @@ import (
 
 func importWasmFile() string {
 	_, filename, _, _ := runtime.Caller(0)
-	return path.Join(path.Dir(filename), "testdata", "examples", "imported_function.wasm")
+	return path.Join(path.Dir(filename), "test", "testdata", "examples", "imported_function.wasm")
 }
 
 // 2️⃣ Write the implementation of the `sum` function, and export it (for cgo).

diff --git a/wasmer/test/example_greet_test.go → wasmer/example_greet_test.go b/wasmer/test/example_greet_test.go → wasmer/example_greet_test.go
@@ -10,7 +10,7 @@ import (
 
 func greetWasmFile() string {
 	_, filename, _, _ := runtime.Caller(0)
-	return path.Join(path.Dir(filename), "testdata", "examples", "greet.wasm")
+	return path.Join(path.Dir(filename), "test", "testdata", "examples", "greet.wasm")
 }
 
 func Example_greet() {

diff --git a/wasmer/test/example_memory_test.go → wasmer/example_memory_test.go b/wasmer/test/example_memory_test.go → wasmer/example_memory_test.go
@@ -9,7 +9,7 @@ import (
 
 func memoryWasmFile() string {
 	_, filename, _, _ := runtime.Caller(0)
-	return path.Join(path.Dir(filename), "testdata", "examples", "memory.wasm")
+	return path.Join(path.Dir(filename), "test", "testdata", "examples", "memory.wasm")
 }
 
 func Example_memory() {

diff --git a/wasmer/test/example_simple_test.go → wasmer/example_simple_test.go b/wasmer/test/example_simple_test.go → wasmer/example_simple_test.go
@@ -9,7 +9,7 @@ import (
 
 func simpleWasmFile() string {
 	_, filename, _, _ := runtime.Caller(0)
-	return path.Join(path.Dir(filename), "testdata", "examples", "simple.wasm")
+	return path.Join(path.Dir(filename), "test", "testdata", "examples", "simple.wasm")
 }
 
 func Example() {

diff --git a/wasmer/test/example_test.go → wasmer/example_test.go b/wasmer/test/example_test.go → wasmer/example_test.go
@@ -9,7 +9,7 @@ import (
 
 func GetBytes() []byte {
 	_, filename, _, _ := runtime.Caller(0)
-	modulePath := path.Join(path.Dir(filename), "testdata", "tests.wasm")
+	modulePath := path.Join(path.Dir(filename), "test", "testdata", "tests.wasm")
 
 	bytes, _ := wasm.ReadBytes(modulePath)