Skip to content

Commit

Permalink
Travis now tests compilation, ldata updated to latest, build.sh tests…
Browse files Browse the repository at this point in the history
… removed
  • Loading branch information
tilkinsc committed Feb 10, 2019
1 parent c1c6dbe commit cc21673
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ if [ "$1" = "driver" ]; then
if [ ! -d "$root/jit" ]; then
mkdir -p $root/jit
cp -r luajit-2.0/src/jit/* $root/jit
ls $root/jit
fi
else
if [ ! -d "lua-all/$2" ]; then
Expand Down Expand Up @@ -351,7 +350,6 @@ if [ "$1" = "package" ]; then
if [ ! -d "$root/jit" ]; then
mkdir -p $root/jit
cp -r luajit-2.0/src/jit/* $root/jit
ls $root/jit
fi
else
if [ ! -d "lua-all/$2" ]; then
Expand Down
4 changes: 2 additions & 2 deletions src/ldata.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@


const char HELP_MESSAGE[] =
"LuaConsole | Version: 1/22/2019\n\n"
"LuaConsole | Version: 2/10/2019\n\n"
#if LUA_VERSION_NUM <= 501
LUA_VERSION " | " LUA_COPYRIGHT "\n"
#else
Expand Down Expand Up @@ -105,7 +105,7 @@ const char HELP_MESSAGE[] =
"- \t\tProcesses input from stdin\n"
"-- \t\tStops processing parameters\n"
#if defined(LUA_JIT_51)
"-j \t\t [LuaJIT] Performs a control command loads an extension module\n"
"-j \t\t [LuaJIT] Performs a control command/loads an extension module\n"
"-O \t\t [LuaJIT] Sets an optimization level/parameters\n"
"-b \t\t [LuaJIT] Saves or lists bytecode\n"
#endif
Expand Down
9 changes: 6 additions & 3 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ pushd bin/Debug
echo "Test 1"
./luaw -e "print('Everything went okay')"

# Code coverage
gcov *.gc*
bash <(curl -s https://codecov.io/bash)

echo "Test 2"
./luaw -w luajit -e "print('Everything went okay')"

Expand All @@ -73,10 +77,12 @@ pushd bin/Debug

echo "Test 6"
./luaw res/testing.lua -Dtest=5 -n a b c
echo "Test 6 end"

echo "Test 7"
./luaw -b res/testing.lua testing.luac
./luaw testing.luac -Dtest=5 -n a b c
echo "Test 7 end"

echo "Test 8"
./luaw -w luajit -c -o testing.luac "res/testing.lua"
Expand All @@ -100,9 +106,6 @@ pushd bin/Debug

popd

# Code coverage
gcov *.gc*
bash <(curl -s https://codecov.io/bash)

# Update cache if needed
cp -f -r -u lua-all $HOME/cistore
Expand Down

0 comments on commit cc21673

Please sign in to comment.