Skip to content

Commit 327a1f2

Browse files
committed
CMake: Make Travis work
1 parent 1713115 commit 327a1f2

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

.travis.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,34 @@ matrix:
1717
- g++-6
1818
- zlib1g-dev
1919
- valgrind
20+
- ninja-build
21+
- git
22+
2023
# OSX
2124
- os: osx
2225
allow_failures:
2326
- os: osx
2427

25-
install:
26-
# Build mrustc
27-
- make RUSTCSRC
28-
- make -j 2
29-
- make -C tools/minicargo
28+
#install:
29+
# Build mrustc
30+
#- make RUSTCSRC
31+
#- make -j 2
32+
#- make -C tools/minicargo
3033

3134
script:
32-
- set -e
33-
- make -f minicargo.mk output/libtest.hir # libstd
34-
- make test # hello_world
35+
- git status
36+
# - set -e
37+
- mkdir build
38+
- cd build
39+
- cmake ..
40+
- make mrustc -j4
41+
- make minicargo -j4
42+
# Test
43+
# - make -f minicargo.mk output/libtest.hir # libstd
44+
# - make test # hello_world
3545
# Tests
36-
- set +e
37-
- make local_tests -k
46+
# - set +e
47+
# - make local_tests -k
3848
# - CC=gcc-6 make rust_tests -k
3949
# rustc (DISABLED: llvm build)
4050
# - make -f minicargo.mk output/rustc

0 commit comments

Comments
 (0)