Skip to content

Commit 41b88b4

Browse files
Update scripts
1 parent 41e2aa0 commit 41b88b4

6 files changed

+241
-33
lines changed

build/buildmsvc_lua53.bat

-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ cmake --build . --config Release --target INSTALL
1818
if %errorlevel% neq 0 exit /b %errorlevel%
1919
cd ..\..
2020

21-
cd ravi-ffi
22-
rmdir build /s /q
23-
mkdir build
24-
cd build
25-
cmake -DCMAKE_INSTALL_PREFIX=c:/Software/lua53 -DUSE_LUA53=ON -G "Visual Studio 16 2019" ..
26-
if %errorlevel% neq 0 exit /b %errorlevel%
27-
cmake --build . --config Release --target INSTALL
28-
if %errorlevel% neq 0 exit /b %errorlevel%
29-
cd ..\..
30-
3121
cd ravi-torch-paths
3222
rmdir build /s /q
3323
mkdir build

build/buildmsvc_ravi_debug.bat

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
cd nj
2-
rmdir build /s /q
3-
mkdir build
4-
cd build
5-
cmake -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
6-
if %errorlevel% neq 0 exit /b %errorlevel%
7-
cmake --build . --config Debug --target INSTALL
8-
if %errorlevel% neq 0 exit /b %errorlevel%
9-
cd ..\..
10-
111
cd ravi-external-libs
122
rmdir build /s /q
133
mkdir build
@@ -24,7 +14,7 @@ cd ravi
2414
rmdir build /s /q
2515
mkdir build
2616
cd build
27-
cmake -DOMR_JIT=ON -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
17+
cmake -DCMAKE_INSTALL_PREFIX=c:/Software/ravi -G "Visual Studio 16 2019" ..
2818
if %errorlevel% neq 0 exit /b %errorlevel%
2919
cmake --build . --config Debug --target INSTALL
3020
if %errorlevel% neq 0 exit /b %errorlevel%

build/osx_build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export LUA_CPATH="$LUA_CPATH;$RAVI_HOME/lib/?.so;$RAVI_HOME/lib/lib?.so"
77
# Note following assumes brew install openssl
88
export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
99

10-
for dir in nj ravi-external-libs ravi ravi-cjson ravi-filesystem ravi-lpeglabel ravi-luasocket ravi-moses ravi-penlight ravi-torch-paths ravi-torch7-sys ravi-torch7 ravi-torch7-xlua ravi-torch7-nn ravi-torch7-optim ravi-torch7-autograd ravi-torch-cephes ravi-libuv-luv ravi-protobuf ravi-luaossl; do
10+
for dir in ravi-external-libs ravi ravi-cjson ravi-filesystem ravi-lpeglabel ravi-luasocket ravi-moses ravi-penlight ravi-torch-paths ravi-torch7-sys ravi-torch7 ravi-torch7-xlua ravi-torch7-nn ravi-torch7-optim ravi-torch7-autograd ravi-torch-cephes ravi-libuv-luv ravi-protobuf ravi-luaossl; do
1111
echo "Building $dir"
12-
cd $dir && rm -rf build && mkdir build && cd build && cmake -DOMR_JIT=ON -DCMAKE_INSTALL_PREFIX=$RAVI_HOME .. && make install && cd ../..
12+
cd $dir && rm -rf build && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$RAVI_HOME .. && make install && cd ../..
1313
done

run_tests.bat

+59
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ set PATH=%RAVI_HOME%\bin;%PATH%
33
set LUA_PATH=%RAVI_HOME%\share\lua\5.3\?.lua;%RAVI_HOME%\share\lua\5.3\?\init.lua;.\?.lua;.\?\init.lua
44
set LUA_CPATH=%RAVI_HOME%\bin\?.dll
55

6+
cd ravi-cjson\tests
7+
ravi test.lua
8+
cd ..\..
9+
610
cd ravi\ravi-tests
711
ravi ravi_tests1.ravi
812
cd ..\..
@@ -34,3 +38,58 @@ cd ..
3438
cd ravi-torch7-autograd\test
3539
ravi test.lua
3640
cd ..\..
41+
42+
cd ravi-lpeglabel
43+
ravi test.lua
44+
ravi testlabel.lua
45+
cd ..
46+
47+
cd ravi-penlight\tests
48+
ravi test-animal.lua
49+
ravi test-args.lua
50+
ravi test-array.lua
51+
ravi test-class.lua
52+
ravi test-compare-no-order.lua
53+
ravi test-compat.lua
54+
ravi test-comprehension.lua
55+
ravi test-config.lua
56+
ravi test-data.lua
57+
ravi test-date.lua
58+
ravi test-dir.lua
59+
ravi test-executeex.lua
60+
ravi test-fenv.lua
61+
ravi test-func.lua
62+
ravi test-import_into.lua
63+
ravi test-job-query.lua
64+
ravi test-klass.lua
65+
ravi test-lapp.lua
66+
ravi test-lexer.lua
67+
ravi test-list.lua
68+
ravi test-map.lua
69+
ravi test-move.lua
70+
ravi test-path.lua
71+
ravi test-pretty-number.lua
72+
ravi test-pretty.lua
73+
ravi test-pylib.lua
74+
ravi test-relpath.lua
75+
ravi test-seq.lua
76+
ravi test-set.lua
77+
ravi test-sip.lua
78+
ravi test-strict.lua
79+
ravi test-stringio.lua
80+
ravi test-stringx.lua
81+
ravi test-super.lua
82+
ravi test-tablex.lua
83+
ravi test-template.lua
84+
ravi test-text.lua
85+
ravi test-types.lua
86+
ravi test-tzone.lua
87+
ravi test-url.lua
88+
ravi test-utils.lua
89+
ravi test-vector.lua
90+
ravi test-xml.lua
91+
cd ../..
92+
93+
cd ravi-libuv-luv
94+
ravi tests\run.lua
95+
cd ..

run_tests.sh

+92-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,93 @@
11
# set -x
2-
source ~/ravi/bin/ravienv.sh
3-
4-
cd ravi/ravi-tests && ravi ravi_tests1.ravi && cd -
5-
cd ravi/lua-tests && ravi -e"_port=1" all.lua && cd -
6-
cd ravi-torch7/test && ravi -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end" && cd -
7-
cd ravi-torch7/test && ravi -ltorch test_qr.lua && cd -
8-
cd ravi-torch7/test && ravi -ltorch test_aliasMultinomial.lua && cd -
9-
cd ravi-torch7/test && ravi -ltorch test_half.lua && cd -
10-
cd ravi-torch7-nn && ravi -ltorch -lnn -e "nn.test()" && cd -
11-
cd ravi-torch7-autograd/test && ravi test.lua && cd -
2+
. ~/ravi/bin/ravienv.sh
3+
4+
cd ravi-cjson/tests
5+
ravi test.lua
6+
cd -
7+
8+
cd ravi/ravi-tests
9+
ravi ravi_tests1.ravi
10+
cd -
11+
12+
cd ravi/lua-tests
13+
ravi -e"_port=1" all.lua
14+
cd -
15+
16+
cd ravi-torch7/test
17+
ravi -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end"
18+
cd -
19+
20+
cd ravi-torch7/test
21+
ravi -ltorch test_qr.lua
22+
cd -
23+
24+
cd ravi-torch7/test
25+
ravi -ltorch test_aliasMultinomial.lua
26+
cd -
27+
28+
cd ravi-torch7/test
29+
ravi -ltorch test_half.lua
30+
cd -
31+
32+
cd ravi-torch7-nn
33+
ravi -ltorch -lnn -e "nn.test()"
34+
cd -
35+
36+
cd ravi-torch7-autograd/test
37+
ravi test.lua
38+
cd -
39+
40+
cd ravi-lpeglabel
41+
ravi test.lua
42+
ravi testlabel.lua
43+
cd -
44+
45+
cd ravi-penlight/tests
46+
ravi test-animal.lua
47+
ravi test-args.lua
48+
ravi test-array.lua
49+
ravi test-class.lua
50+
ravi test-compare-no-order.lua
51+
ravi test-compat.lua
52+
ravi test-comprehension.lua
53+
ravi test-config.lua
54+
ravi test-data.lua
55+
ravi test-date.lua
56+
ravi test-dir.lua
57+
ravi test-executeex.lua
58+
ravi test-fenv.lua
59+
ravi test-func.lua
60+
ravi test-import_into.lua
61+
ravi test-job-query.lua
62+
ravi test-klass.lua
63+
ravi test-lapp.lua
64+
ravi test-lexer.lua
65+
ravi test-list.lua
66+
ravi test-map.lua
67+
ravi test-move.lua
68+
ravi test-path.lua
69+
ravi test-pretty-number.lua
70+
ravi test-pretty.lua
71+
ravi test-pylib.lua
72+
ravi test-relpath.lua
73+
ravi test-seq.lua
74+
ravi test-set.lua
75+
ravi test-sip.lua
76+
ravi test-strict.lua
77+
ravi test-stringio.lua
78+
ravi test-stringx.lua
79+
ravi test-super.lua
80+
ravi test-tablex.lua
81+
ravi test-template.lua
82+
ravi test-text.lua
83+
ravi test-types.lua
84+
ravi test-tzone.lua
85+
ravi test-url.lua
86+
ravi test-utils.lua
87+
ravi test-vector.lua
88+
ravi test-xml.lua
89+
cd -
90+
91+
cd ravi-libuv-luv
92+
ravi tests/run.lua
93+
cd -

run_tests_lua53.bat

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
set RAVI_HOME=c:\Software\lua53
2+
set PATH=%RAVI_HOME%\bin;%PATH%
3+
set LUA_PATH=%RAVI_HOME%\share\lua\5.3\?.lua;%RAVI_HOME%\share\lua\5.3\?\init.lua;.\?.lua;.\?\init.lua
4+
set LUA_CPATH=%RAVI_HOME%\bin\?.dll
5+
6+
cd ravi-cjson\tests
7+
lua test.lua
8+
cd ..\..
9+
10+
cd ravi-torch7\test
11+
lua -ltorch -e "t=torch.test(); if t.errors[1] then os.exit(1) end"
12+
cd ..\..
13+
14+
cd ravi-torch7\test
15+
lua -ltorch test_qr.lua
16+
cd ..\..
17+
18+
cd ravi-torch7\test
19+
lua -ltorch test_aliasMultinomial.lua
20+
cd ..\..
21+
22+
cd ravi-torch7\test
23+
lua -ltorch test_half.lua
24+
cd ..\..
25+
26+
cd ravi-torch7-nn
27+
lua -ltorch -lnn -e "nn.test()"
28+
cd ..
29+
30+
cd ravi-torch7-autograd\test
31+
lua test.lua
32+
cd ..\..
33+
34+
cd ravi-lpeglabel
35+
lua test.lua
36+
lua testlabel.lua
37+
cd ..
38+
39+
cd ravi-penlight\tests
40+
lua test-animal.lua
41+
lua test-args.lua
42+
lua test-array.lua
43+
lua test-class.lua
44+
lua test-compare-no-order.lua
45+
lua test-compat.lua
46+
lua test-comprehension.lua
47+
lua test-config.lua
48+
lua test-data.lua
49+
lua test-date.lua
50+
lua test-dir.lua
51+
lua test-executeex.lua
52+
lua test-fenv.lua
53+
lua test-func.lua
54+
lua test-import_into.lua
55+
lua test-job-query.lua
56+
lua test-klass.lua
57+
lua test-lapp.lua
58+
lua test-lexer.lua
59+
lua test-list.lua
60+
lua test-map.lua
61+
lua test-move.lua
62+
lua test-path.lua
63+
lua test-pretty-number.lua
64+
lua test-pretty.lua
65+
lua test-pylib.lua
66+
lua test-relpath.lua
67+
lua test-seq.lua
68+
lua test-set.lua
69+
lua test-sip.lua
70+
lua test-strict.lua
71+
lua test-stringio.lua
72+
lua test-stringx.lua
73+
lua test-super.lua
74+
lua test-tablex.lua
75+
lua test-template.lua
76+
lua test-text.lua
77+
lua test-types.lua
78+
lua test-tzone.lua
79+
lua test-url.lua
80+
lua test-utils.lua
81+
lua test-vector.lua
82+
lua test-xml.lua
83+
cd ../..
84+
85+
cd ravi-libuv-luv
86+
lua tests\run.lua
87+
cd ..

0 commit comments

Comments
 (0)