1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

travis: run "v test v" instead of the mak_tests.bat wrapper

This commit is contained in:
Alexander Medvednikov 2019-08-27 13:21:05 +03:00
parent f6147b7ac7
commit 57ab8546fe
2 changed files with 8 additions and 50 deletions

View File

@ -12,9 +12,9 @@ matrix:
- gcc-5 - gcc-5
- g++-5 - g++-5
- make - make
- libglfw3 - libglfw3
- libglfw3-dev - libglfw3-dev
- libfreetype6-dev - libfreetype6-dev
- libssl-dev - libssl-dev
- os: windows - os: windows
language: sh language: sh
@ -35,7 +35,7 @@ script:
- | - |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/ export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
fi fi
- | - |
if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
git clone --depth=1 https://github.com/ubawurinna/freetype-windows-binaries thirdparty/freetype/ 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 ##./v.exe ./compiler/tests/repl/repl_test.v
echo "Testing msvc bootstrapping" echo "Testing msvc bootstrapping"
./make_msvc.bat ./make_msvc.bat
echo "Running make_tests.bat..." echo "Running v test v..."
./make_tests.bat v.exe test v
fi fi
- | - |
if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then
make make
#./v install glfw #./v install glfw
./v test v ./v test v
fi fi
- | - |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
git clone https://github.com/vlang/vid git clone https://github.com/vlang/vid
cd vid && ../v -debug -o vid . cd vid && ../v -debug -o vid .
fi fi

View File

@ -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