CI update to mimic aws-c-io

Author: RandyGaul

.clang-format

@@ -55,4 +55,3 @@ Standard:        Cpp11
 TabWidth:        4
 UseTab:          Never
 ...
-

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,google-runtime-int,llvm-header-guard,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,google-runtime-int,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '\./*'
 FormatStyle: 'file'
@@ -12,4 +12,4 @@ CheckOptions:
   - key:             fuchsia-restrict-system-includes.Includes
     value:           '*,-stdint.h,-stdbool.h'
 
-...
+...

.travis.yml

@@ -1,14 +1,21 @@
-sudo: false
+sudo: true
 language: c
 
 osx_image: xcode8
 
+#run builds for linux and osx. will add windows shortly
 os:
-  - osx
+#  - osx add osx back when travis fixes their mac os scaling problems.
+  - linux
 
+#run builds on both gcc and clang
 compiler:
+  - gcc
   - clang
 
+install:
+  - sudo apt-get install -qq cppcheck
+
 #execute build
 script:
-  - ./codebuild/common-macos.sh
+  - .travis/travis_build.sh

.travis/travis_build.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+set -e
+
+PROJECT_DIR=`pwd`
+cd ..
+
+#build aws-c-common
+git clone https://github.com/awslabs/aws-c-common.git
+mkdir common-build && cd common-build
+cmake ../aws-c-common
+make && make test
+cd ..
+
+#build s2n
+git clone https://github.com/awslabs/s2n.git
+mkdir s2n-build && cd s2n-build
+cmake ../s2n
+make && make test
+cd ..
+
+#build aws-c-io
+cd $PROJECT_DIR
+cppcheck --enable=all --std=c99 --language=c --suppress=unusedFunction -I include ../aws-c-common/include --force --error-exitcode=-1 ./
+cd ..
+mkdir build && cd build
+cmake -Ds2n_DIR="../s2n-build" -Daws-c-common_DIR="../common-build" $PROJECT_DIR
+make && make test

CMakeLists.txt

@@ -7,10 +7,6 @@ include(AwsCFlags)
 include(Sanitizers)
 include(CheckCCompilerFlag)
 
-option(BUILD_PORTABLE_BINARIES
-        "Build Relocatable Binaries, this will turn off features that will fail on older kernels than used for the build."
-        OFF)
-
 file(GLOB AWS_HTTP_HEADERS
         "include/aws/http/*.h"
         )

codebuild/common-linux.sh

@@ -1,28 +1,38 @@
 #!/bin/bash
 
-cd ../
+set -e
 
-mkdir install
+CMAKE_ARGS="$@"
 
-git clone https://github.com/awslabs/aws-c-common.git
-cd aws-c-common
-mkdir build
-cd build
+function install_library {
+    git clone https://github.com/awslabs/$1.git
+    cd $1
+    mkdir build
+    cd build
+
+    cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $CMAKE_ARGS ../
+    make install
+    
+    cd ../..
+}
 
-cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $@ ../
-make install
 
-cd ../..
+cd ../
+
+mkdir install
+
+install_library s2n
+install_library aws-c-common
 
-cd aws-c-http
+cd aws-c-io
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $@ ../
+cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $CMAKE_ARGS ../
 
 make
 
 LSAN_OPTIONS=verbosity=1:log_threads=1 ctest --output-on-failure
 
 cd ..
 
-./cppcheck.sh ../install/include
+# ./cppcheck.sh ../install/include

codebuild/common-macos.sh

@@ -4,25 +4,31 @@
 
 set -e
 
-cd ../
+CMAKE_ARGS="$@"
 
-mkdir install
+function install_library {
+    git clone https://github.com/awslabs/$1.git
+    cd $1
+    mkdir build
+    cd build
 
-git clone https://github.com/awslabs/aws-c-common.git
-cd aws-c-common
-mkdir build
-cd build
+    cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $CMAKE_ARGS ../
+    make install
+    
+    cd ../..
+}
 
-cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $@ ../
-make install
+cd ../
+
+mkdir install
 
-cd ../..
+install_library aws-c-common
 
-cd aws-c-http
+cd aws-c-io
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $@ ../
+cmake -DCMAKE_INSTALL_PREFIX=../../install -DENABLE_SANITIZERS=ON $CMAKE_ARGS ../
 
 make
 
-LSAN_OPTIONS=verbosity=1:log_threads=1 ctest --output-on-failure
+LSAN_OPTIONS=verbosity=1:log_threads=1 ctest --output-on-failure

codebuild/common-windows.bat

@@ -1,27 +1,29 @@
-
 cd ../
+set CMAKE_ARGS=%*
+
 mkdir install
 
-git clone https://github.com/awslabs/aws-c-common.git
-cd aws-c-common
-mkdir build
-cd build
-cmake %* -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX=../../install ../ || goto error
-msbuild.exe aws-c-common.vcxproj /p:Configuration=Release || goto error
-msbuild.exe INSTALL.vcxproj /p:Configuration=Release || goto error
-ctest -V || goto error
-cd ../..
+CALL :install_library aws-c-common
 
-cd aws-c-http
+cd aws-c-io
 mkdir build
 cd build
-cmake %* -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX=../../install ../ || goto error
-msbuild.exe aws-c-http.vcxproj /p:Configuration=Release || goto error
-msbuild.exe tests/aws-c-http-tests.vcxproj /p:Configuration=Release || goto error
+cmake %CMAKE_ARGS% -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX=../../install ../ || goto error
+cmake --build . --config Release || goto error
 ctest -V
 
 goto :EOF
 
+:install_library
+git clone https://github.com/awslabs/%~1.git
+cd %~1
+mkdir build
+cd build
+cmake %CMAKE_ARGS% -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX=../../install ../ || goto error
+cmake --build . --target install --config Release || goto error
+cd ../..
+exit /b %errorlevel%
+
 :error
 echo Failed with error #%errorlevel%.
 exit /b %errorlevel%

codebuild/linux-clang3-x64.yml

@@ -14,8 +14,7 @@ phases:
     commands:
       - echo Build started on `date`
       - ./codebuild/common-linux.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-      - clang-tidy-3.9 -p=build **/*.c
+      # - clang-tidy-3.9 -p=build **/*.c
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-clang6-x64.yml

@@ -16,10 +16,9 @@ phases:
   build:
     commands:
       - echo Build started on `date`
-      - ./codebuild/common-linux.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_FUZZ_TESTS=ON
+      - ./codebuild/common-linux.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       - clang-tidy-6.0 -p=build **/*.c
       - ./format-check.sh
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-gcc-4x-x64.yml

@@ -15,4 +15,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-gcc-4x-x86.yml

@@ -15,4 +15,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-gcc-5x-x64.yml

@@ -16,4 +16,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-gcc-6x-x64.yml

@@ -16,4 +16,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/linux-gcc-7x-x64.yml

@@ -16,4 +16,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-

codebuild/windows-msvc-2015-x86.yml

@@ -4,4 +4,3 @@ phases:
   build:
     commands:
       - .\codebuild\common-windows.bat -G "Visual Studio 14 2015"
-

codebuild/windows-msvc-2015.yml

@@ -4,4 +4,3 @@ phases:
   build:
     commands:
       - .\codebuild\common-windows.bat -G "Visual Studio 14 2015 Win64"
-

codebuild/windows-msvc-2017.yml

@@ -4,4 +4,3 @@ phases:
   build:
     commands:
       - .\codebuild\common-windows.bat -G "Visual Studio 15 2017 Win64"
-

format-check.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [[ -z $CLANG_FORMAT ]] ; then
     CLANG_FORMAT=clang-format
@@ -21,4 +21,4 @@ do
     fi
 done
 
-exit $FAIL
+exit $FAIL