git ssb - Merge pull request #11 from ewasm/sexpr · wanderer🌟/js-primea-hypervisor@b1c93ede

Move sexpr-wasm-prototype to tools

wanderer authored on 8/3/2016, 11:40:56 PM
GitHub committed on 8/3/2016, 11:40:56 PM
Parent: 8399834b6862bec67ec1c8baa145c7163cc4d3f9
Parent: efd9ca81724858a16212833d23944dcec15769c4

.gitmodulesView
		@@ -1,3 +1,3 @@
1	1	[submodule "sexpr-wasm-prototype"]
2		- path = sexpr-wasm-prototype
	2	+ path = tools/sexpr-wasm-prototype
3	3	url = https://github.com/WebAssembly/sexpr-wasm-prototype.git

README.mdView
		@@ -21,14 +21,13 @@
21	21	# TESTS
22	22	The tests are written in wasm's text format (.wast) which are then compiled into binary format and ran in node.
23	23
24	24	To run the test you need
25		-* `git submodule update --init`
26		-* `cd sexpr-wasm-prototype`
	25	+* `git submodule update --init --recursive`
	26	+* `cd tools/sexpr-wasm-prototype`
27	27	* `git checkout origin/binary_0xa`
28		-* `git submodule update --init`
29	28	* `make`
30		-* `cd ..`
	29	+* `cd ../..`
31	30	* `npm test`
32	31
33	32
34	33	# API

tests/interfaceRunner.jsView
		@@ -14,9 +14,9 @@
14	14	for (let testName of tests) {
15	15	testName = testName.split('.')[0]
16	16	tape(testName, (t) => {
17	17	// Compile Command
18		- cp.execSync(`${__dirname}/../../evm-wasm-transcompiler/deps/sexpr-wasm-prototype/out/sexpr-wasm ${dir}/${testName}.wast -o ${dir}/${testName}.wasm`)
	18	+ cp.execSync(`${__dirname}/../tools/sexpr-wasm-prototype/out/sexpr-wasm ${dir}/${testName}.wast -o ${dir}/${testName}.wasm`)
19	19	const buffer = fs.readFileSync(`${dir}/${testName}.wasm`)
20	20	const envData = fs.readFileSync(`${dir}/${testName}.json`)
21	21	const ethereum = new Kernel(new Environment(envData))
22	22

sexpr-wasm-prototypeView
		@@ -1,1 +1,0 @@
1		-Subproject commit b487574ba29dd85c64be6aa1406b58084b14b8b4

tools/sexpr-wasm-prototype
		@@ -1,0 +1,1 @@
	1	+Subproject commit b487574ba29dd85c64be6aa1406b58084b14b8b4

wanderer🌟 / js-primea-hypervisor