marge cspot to master

components/spotify/cspot/bell/external/cJSON/tests/unity/.gitattributes

@@ -1,30 +0,0 @@
-*           text=auto
-
-# These files are text and should be normalized (convert crlf to lf)
-*.rb        text
-*.test      text
-*.c         text
-*.cpp       text
-*.h         text
-*.txt       text
-*.yml       text
-*.s79       text
-*.bat       text
-*.xcl       text
-*.inc       text
-*.info      text
-*.md        text
-makefile    text
-rakefile    text
-
-
-#These files are binary and should not be normalized
-*.doc       binary
-*.odt       binary
-*.pdf       binary
-*.ewd       binary
-*.eww       binary
-*.dni       binary
-*.wsdt      binary
-*.dbgdt     binary
-*.mac       binary

components/spotify/cspot/bell/external/cJSON/tests/unity/.gitignore

@@ -1,9 +0,0 @@
-build/
-test/sandbox
-.DS_Store
-examples/example_1/test1.exe
-examples/example_1/test2.exe
-examples/example_2/all_tests.exe
-examples/example_1/test1.out
-examples/example_1/test2.out
-examples/example_2/all_tests.out

components/spotify/cspot/bell/external/cJSON/tests/unity/.travis.yml

@@ -1,29 +0,0 @@
-language: c
-
-matrix:
- include:
-    - os: osx
-      compiler: clang
-      osx_image: xcode7.3
-    - os: linux
-      dist: trusty
-      compiler: gcc
-
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.1 && rvm use 2.1 && ruby -v; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install --assume-yes --quiet gcc-multilib; fi
-install:
-  - gem install rspec
-  - gem install rubocop
-script:
-  - cd test && rake ci
-  - make -s
-  - make -s DEBUG=-m32 #32-bit architecture with 64-bit support
-  - make -s DEBUG=-m32 UNITY_SUPPORT_64= #32-bit build without 64-bit types
-  - make -s UNITY_INCLUDE_DOUBLE= # without double
-  - cd ../extras/fixture/test && rake ci
-  - make -s default noStdlibMalloc
-  - make -s C89
-  - cd ../../../examples/example_1 && make -s ci
-  - cd ../example_2 && make -s ci
-  - cd ../example_3 && rake