Skip to content

Commit

Permalink
Travis PR validation moji check (electronicarts#112)
Browse files Browse the repository at this point in the history
  • Loading branch information
theryee authored and rparolin committed Jun 28, 2017
1 parent d321f48 commit cc0f3b1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ addons:

matrix:
include:
- compiler: clang "release build with clang to trigger MOJI check"
env: EASTL_CONFIG=Release USE_MOJI_CHECK=yes
os: linux
- compiler: clang "debug build with clang3.9"
env: EASTL_CONFIG=Debug USE_CLANG_39=yes
os: osx
Expand All @@ -40,6 +43,9 @@ matrix:
compiler: gcc

install:
# MOJI check; exit 1 if non-ascii characters detected in C++
- if [[ -n "$USE_MOJI_CHECK" && -n `git grep -P "[^[:ascii:]]" source test` ]]; then echo "Moji Detected" && exit 1 ;fi
- if [[ -n "$USE_MOJI_CHECK" ]]; then exit 0 ;fi
# Linux Setup
# CMake
- if [[ "$TRAVIS_OS_NAME" == "linux" && ! -n "$USE_BUCK" ]]; then wget --no-check-certificate http://cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.tar.gz ;fi
Expand Down
4 changes: 2 additions & 2 deletions test/source/TestHash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,8 @@ int TestHash()
// GCC has a bug with overloading rvalue and lvalue function templates.
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54425
//
// error: eastl::pair<T1, T2>::pair(T1&&) [with T1 = const int&; T2 = const int&] cannot be overloaded
// error: with eastl::pair<T1, T2>::pair(const T1&) [with T1 = const int&; T2 = const int&]
// error: 'eastl::pair<T1, T2>::pair(T1&&) [with T1 = const int&; T2 = const int&]' cannot be overloaded
// error: with 'eastl::pair<T1, T2>::pair(const T1&) [with T1 = const int&; T2 = const int&]'
#if EASTL_MOVE_SEMANTICS_ENABLED && !defined(EA_COMPILER_GNUC)
{
EA_DISABLE_VC_WARNING(4626)
Expand Down

0 comments on commit cc0f3b1

Please sign in to comment.