Skip to content

Commit

Permalink
travis: fix mips build to use correct host
Browse files Browse the repository at this point in the history
The host is the OS that the binary will run on,
this ensures that CPU_RISC is set to true.

Run all test with make runtest.
  • Loading branch information
pabuhler committed Nov 13, 2017
1 parent 0741397 commit abe5e32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,11 @@ matrix:
- sudo docker exec --tty mipsX apt-get install build-essential -y
- sudo docker exec --tty mipsX apt-get install gcc-mips-linux-gnu -y
script:
- sudo docker exec --tty mipsX bash -c 'EXTRA_CFLAGS=-static CC=mips-linux-gnu-gcc ./configure --host=x86_64-linux-gnu'
- sudo docker exec --tty mipsX bash -c 'EXTRA_CFLAGS=-static CC=mips-linux-gnu-gcc ./configure --host=mips-linux-gnu'
- sudo docker exec --tty mipsX make
- sudo docker kill mipsX
- file test/srtp_driver
- test/srtp_driver -v
- file test/test_srtp
- test/test_srtp
- make runtest

# coverity scan
- os: linux
Expand Down
9 changes: 3 additions & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ endif

crypto_testapp = $(AES_CALC) crypto/test/cipher_driver$(EXE) \
crypto/test/datatypes_driver$(EXE) crypto/test/kernel_driver$(EXE) \
crypto/test/sha1_driver$(EXE) \
crypto/test/stat_driver$(EXE)
crypto/test/sha1_driver$(EXE) crypto/test/stat_driver$(EXE) \
crypto/test/env$(EXE)

testapp = $(crypto_testapp) test/srtp_driver$(EXE) test/replay_driver$(EXE) \
test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
Expand Down Expand Up @@ -207,10 +207,7 @@ crypto/test/cipher_driver$(EXE): crypto/test/cipher_driver.c test/getopt_s.c
crypto/test/kernel_driver$(EXE): crypto/test/kernel_driver.c test/getopt_s.c
$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)

crypto/test/rand_gen$(EXE): crypto/test/rand_gen.c test/getopt_s.c
$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)

crypto/test/rand_gen_soak$(EXE): crypto/test/rand_gen_soak.c test/getopt_s.c
crypto/test/env$(EXE): crypto/test/env.c test/getopt_s.c
$(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)

test: $(testapp)
Expand Down

0 comments on commit abe5e32

Please sign in to comment.