Skip to content
Browse files

Merge pull request #161 from sbc100/update_travis

Use separate build and install scripts in travis
  • Loading branch information...
2 parents 5e14ae7 + 7475ce9 commit 184c62b7d7761481609ef1c1484ada659ae181b9 @nigels-com nigels-com committed Mar 23, 2016
Showing with 58 additions and 30 deletions.
  1. +16 −12 .gitignore
  2. +18 −16 .travis.yml
  3. +0 −2 Makefile.regaltest
  4. +1 −0 README.rst
  5. +1 −0 config/Makefile.nacl-arm
  6. +12 −0 scripts/travis-build.sh
  7. +10 −0 scripts/travis-install.sh
View
28 .gitignore
@@ -1,6 +1,6 @@
-lib
-tmp
-bin
+/lib
+/tmp
+/bin
depends
built
build
@@ -19,6 +19,7 @@ project.xcworkspace
*.vcxproj.*
*.sdf
*.swp
+*.opensdf
j
j0
j1
@@ -32,12 +33,15 @@ testing/*/*.so
testing/*/*.so.1
testing/*/*.dylib
testing/*/gold
-examples/nacl/lib64
-examples/nacl/lib32
-examples/nacl/*.nexe
-examples/nacl/*.nmf
-build/ppapi/vs2010/Regal/win
-build/win32/vs2010/Regal/Debug
-build/win32/vs2010/Regal/Release
-build/win32/vs2010/Regal/ipch
-*.opensdf
+/examples/nacl/lib64
+/examples/nacl/lib32
+/examples/nacl/*.nexe
+/examples/nacl/*.nmf
+/build/ppapi/vs2010/Regal/win
+/build/win32/vs2010/Regal/Debug
+/build/win32/vs2010/Regal/Release
+/build/win32/vs2010/Regal/ipch
+
+# Downloaded by scripts/travis-install.sh
+/nacl_sdk
+/nacl_sdk.zip
View
34 .travis.yml
@@ -1,22 +1,24 @@
language: cpp
+
+sudo: false
+
+addons:
+ apt:
+ packages:
+ # install i386 base libraries for the NaCl toolchain (parts of which are
+ # 32-bit) as well as the regal linux build deps.
+ - libc6:i386
+ - libstdc++6:i386
+ - libglib2.0-0:i386
+ - libxmu-dev
+ - libxi-dev
+
script:
- - export NACL_SDK_ROOT=$PWD/nacl_sdk/pepper_canary
- - export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin
- - export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_arm_newlib/bin
- - make -j4
- # Tests don't currently run under nacl on the travis VMs
- # Some kind of OOM issue. TODO(sbc): find out why and fix.
- - "if [ \"$SYSTEM\" = linux ]; then make test; fi"
+ - scripts/travis-build.sh
+
install:
- - "if [ \"$SYSTEM\" != linux ]; then sudo apt-get update; fi"
- # install i686 base libraries so the the NaCl compiler (which is 32-bit) can run
- - "if [ \"$SYSTEM\" != linux ]; then sudo apt-get install libc6:i386 libstdc++6:i386; fi"
- # install NaCl SDK
- - "if [ \"$SYSTEM\" != linux ]; then wget http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip; fi"
- - "if [ \"$SYSTEM\" != linux ]; then unzip nacl_sdk.zip; fi"
- - "if [ \"$SYSTEM\" != linux ]; then nacl_sdk/naclsdk update --force pepper_canary; fi"
- # Install regal linux build deps
- - "if [ \"$SYSTEM\" = linux ]; then sudo apt-get install libxmu-dev libxi-dev; fi"
+ - scripts/travis-install.sh
+
env:
- SYSTEM=linux
- SYSTEM=nacl-i686
View
2 Makefile.regaltest
@@ -69,15 +69,13 @@ ifneq ($(STRIP),)
$(LOG_STRIP)$(STRIP) -x $@
endif
-ifneq ($(NACL_ARCH),arm)
test: bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
@echo Running tests: $^
ifeq ($(filter nacl%,$(SYSTEM)),)
$^
else
"$(NACL_SDK_ROOT)/tools/sel_ldr.py" $^
endif
-endif
endif
endif
View
1 README.rst
@@ -420,6 +420,7 @@ Regal code, API database and generators are `BSD <http://opensource.org/licenses
Copyright (c) 2012 Scott Nations
Copyright (c) 2012 Mathias Schott
Copyright (c) 2012 Nigel Stewart
+ Copyright (c) 2015 Google Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
View
1 config/Makefile.nacl-arm
@@ -20,6 +20,7 @@ LDFLAGS.GL =
LDFLAGS.GLU = -lRegalGLU
LDFLAGS.GLUT = -lRegalGLUT
LDFLAGS.STATIC =
+CFLAGS.EXTRA += -mfpu=vfp
BIN.SUFFIX =
LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
LIB.DEVLNK = lib$(NAME).so
View
12 scripts/travis-build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+set -e
+
+if [[ $SYSTEM =~ nacl* ]]; then
+ export NACL_SDK_ROOT=$PWD/nacl_sdk/pepper_45
+fi
+
+make -j4
+
+make test
View
10 scripts/travis-install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -x
+set -e
+
+if [[ $SYSTEM =~ nacl* ]]; then
+ wget http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip
+ unzip nacl_sdk.zip
+ nacl_sdk/naclsdk update --force pepper_45
+fi

0 comments on commit 184c62b

Please sign in to comment.
Something went wrong with that request. Please try again.