File tree Expand file tree Collapse file tree 3 files changed +5
-20
lines changed Expand file tree Collapse file tree 3 files changed +5
-20
lines changed Original file line number Diff line number Diff line change 1
1
sudo : false
2
2
3
- dist : xenial
3
+ dist : bionic
4
4
5
5
language : rust
6
6
@@ -40,29 +40,14 @@ install:
40
40
sudo apt update;
41
41
sudo apt install device-tree-compiler -y;
42
42
fi
43
- - if [ 1 ]; then
44
- [ $ARCH = riscv32 ] && export FILE="riscv32-linux-musl-cross";
45
- [ $ARCH = riscv64 ] && export FILE="riscv64-linux-musl-cross";
46
- [ $ARCH = mipsel ] && export FILE="mipsel-linux-musln32-cross";
47
- [ $ARCH = aarch64 ] && export FILE="aarch64-linux-musl-cross";
48
- [ $ARCH = x86_64 ] && export FILE="x86_64-linux-musl-cross";
49
- if [ $TRAVIS_OS_NAME = linux ]; then
50
- wget https://musl.cc/$FILE.tgz;
51
- elif [ $TRAVIS_OS_NAME = osx ]; then
52
- wget https://mac.musl.cc/$FILE.tgz;
53
- fi;
54
- tar -xf $FILE.tgz;
55
- export PATH=$PATH:$PWD/$FILE/bin;
56
- fi
57
-
58
43
59
44
before_script :
60
45
- rustup component add rust-src llvm-tools-preview
61
46
- (test -x $HOME/.cargo/bin/cargo-objdump || cargo install cargo-binutils)
62
47
- (test -x $HOME/.cargo/bin/cargo-xbuild || cargo install cargo-xbuild)
63
48
64
49
script :
65
- - cd user && make sfsimg arch=$ARCH && cd ..
50
+ - cd user && make sfsimg arch=$ARCH prebuilt=1 && cd ..
66
51
- cd kernel && make build arch=$ARCH $OPTS && cd ..
67
52
- if [ $ARCH = riscv32 ]; then
68
53
cd tests && ./test.sh && cd ..;
Original file line number Diff line number Diff line change @@ -257,10 +257,10 @@ runtest: build justruntest
257
257
justrun :
258
258
@qemu-system-$(arch ) $(qemu_opts )
259
259
260
- justrunnet : build
260
+ justrunnet :
261
261
@sudo qemu-system-$(arch ) $(qemu_opts ) $(qemu_net_opts )
262
262
263
- justruntest : build
263
+ justruntest :
264
264
@qemu-system-$(arch ) $(filter-out -serial mon:stdio, $(qemu_opts ) ) --append $(init ) -serial file:../tests/stdout -monitor null
265
265
266
266
debug : $(kernel ) $(kernel_img )
You can’t perform that action at this time.
0 commit comments