travis: run "v test v" instead of the mak_tests.bat wrapper
parent
f6147b7ac7
commit
57ab8546fe
16
.travis.yml
16
.travis.yml
|
@ -12,9 +12,9 @@ matrix:
|
|||
- gcc-5
|
||||
- g++-5
|
||||
- make
|
||||
- libglfw3
|
||||
- libglfw3
|
||||
- libglfw3-dev
|
||||
- libfreetype6-dev
|
||||
- libfreetype6-dev
|
||||
- libssl-dev
|
||||
- os: windows
|
||||
language: sh
|
||||
|
@ -35,7 +35,7 @@ script:
|
|||
- |
|
||||
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
|
||||
export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
|
||||
fi
|
||||
fi
|
||||
- |
|
||||
if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
|
||||
git clone --depth=1 https://github.com/ubawurinna/freetype-windows-binaries thirdparty/freetype/
|
||||
|
@ -45,17 +45,17 @@ script:
|
|||
##./v.exe ./compiler/tests/repl/repl_test.v
|
||||
echo "Testing msvc bootstrapping"
|
||||
./make_msvc.bat
|
||||
echo "Running make_tests.bat..."
|
||||
./make_tests.bat
|
||||
echo "Running v test v..."
|
||||
v.exe test v
|
||||
fi
|
||||
- |
|
||||
if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then
|
||||
make
|
||||
#./v install glfw
|
||||
./v test v
|
||||
./v test v
|
||||
fi
|
||||
- |
|
||||
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
|
||||
git clone https://github.com/vlang/vid
|
||||
cd vid && ../v -debug -o vid .
|
||||
fi
|
||||
cd vid && ../v -debug -o vid .
|
||||
fi
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
@echo off
|
||||
|
||||
echo Cleanup
|
||||
del v.exe
|
||||
del v_win.c
|
||||
del v2.exe
|
||||
|
||||
echo fetch v_win.c
|
||||
curl -O https://raw.githubusercontent.com/vlang/vc/master/v_win.c
|
||||
if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
echo build vc using gcc
|
||||
gcc -std=gnu11 -DUNICODE -D_UNICODE -w -o vc.exe v_win.c
|
||||
del v_win.c
|
||||
if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
echo build v using vc
|
||||
vc.exe -o v.exe compiler
|
||||
if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
|
||||
setlocal EnableDelayedExpansion
|
||||
echo testing v
|
||||
v test v
|
||||
if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
echo skipping build vc.msvc using vc
|
||||
REM vc.exe -os msvc -o v.msvc.exe compiler
|
||||
REM if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
echo skipping testing v.msvc -os msvc
|
||||
REM v.msvc.exe -os msvc test v
|
||||
REM if %ERRORLEVEL% NEQ 0 goto :fail
|
||||
|
||||
goto :done
|
||||
|
||||
:fail
|
||||
echo fail
|
||||
exit /b 1
|
||||
|
||||
:done
|
||||
echo pass
|
Loading…
Reference in New Issue