Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for build error in integration test random.cpp #301

Merged
merged 2 commits into from
Sep 10, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
before_install:
- sudo apt-get update
install:
- cd .. && $TRAVIS_BUILD_DIR/ci/clone_repos.sh $TRAVIS_BRANCH $TRAVIS_BRANCH && cd $TRAVIS_BUILD_DIR
- cd .. && $TRAVIS_BUILD_DIR/ci/clone_repos.sh master master && cd $TRAVIS_BUILD_DIR
- npm install -g spark-cli
- ./ci/install_arm_gcc.sh && ./ci/install_gcc.sh
- ./ci/create_spark_cli_json.sh
Expand Down
5 changes: 3 additions & 2 deletions tests/core-v1/testapp1/random.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include <stdlib.h>
#include <array>
#include "application.h"
#include "unit-test/unit-test.h"
#include <array>
#include <stdlib.h>

// the headers have to be declared in this order, or the #define min() in the spark wiring clashes with std::min)

template <std::size_t size> void fillBuf(std::array<int, size>& buf, int min, int max) {
int count = size;
Expand Down
1 change: 1 addition & 0 deletions tests/libraries/unit-test/SparkParty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class PrintTee : public Print {
virtual size_t write(uint8_t w) {
p1.write(w);
p2.write(w);
return 1;
}

virtual size_t write(const uint8_t *buffer, size_t size) {
Expand Down