Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7f62a32

Browse files
committed
Merge pull requestFirebaseExtended#94 from ed7coyne/tests-travis
Add modem tests to travis.
2 parents34f51e6 +10a3e4e commit7f62a32

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

‎.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language:c
1+
language:c++
22
sudo:false
33
addons:
44
apt:
@@ -7,16 +7,19 @@ addons:
77
packages:
88
-g++-4.8
99
env:
10-
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.1.0GCC_VERSION=4.8ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino CXX=g++-${GCC_VERSION}
11-
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.2.0-rc1GCC_VERSION=4.8ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino CXX=g++-${GCC_VERSION}
12-
-ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=masterGCC_VERSION=4.8ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino CXX=g++-${GCC_VERSION}
10+
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.1.0 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
11+
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.2.0-rc1 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
12+
-ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=master ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
1313
install:
14+
-if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
1415
-( cd ${HOME} && curl -O https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz && tar xvf arduino-${ARDUINO_VERSION}-linux64.tar.xz )
1516
-git clone --branch ${ARDUINO_ESP8266_VERSION} https://github.com/esp8266/Arduino.git ${ARDUINO_ESP8266_ROOT}
17+
-git submodule init && git submodule update
1618
-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
1719
before_script:
1820
-mkdir -p ${ARDUINO_HOME}/libraries
1921
-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson )
2022
script:
2123
-${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
22-
-cd test && make check
24+
-(cd test && make check)
25+
-(cd test/modem/ && make test)

‎src/Firebase.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ class FirebaseCall {
9191
constchar* method,const String& path,
9292
const String& data ="",
9393
FirebaseHttpClient* http =NULL);
94+
virtual~FirebaseCall() {}
95+
9496
virtualconst FirebaseError&error()const {
9597
return error_;
9698
}
9799

98-
virtualconst String&response() {
100+
virtualconst String&response()const{
99101
return response_;
100102
}
101103

@@ -134,6 +136,7 @@ class FirebasePush : public FirebaseCall {
134136
FirebasePush() {}
135137
FirebasePush(const String& host,const String& auth,
136138
const String& path,const String& value, FirebaseHttpClient* http =NULL);
139+
virtual~FirebasePush() {}
137140

138141
virtualconst String&name()const {
139142
return name_;
@@ -156,6 +159,7 @@ class FirebaseStream : public FirebaseCall {
156159
FirebaseStream() {}
157160
FirebaseStream(const String& host,const String& auth,
158161
const String& path, FirebaseHttpClient* http =NULL);
162+
virtual~FirebaseStream() {}
159163

160164
// Return if there is any event available to read.
161165
virtualboolavailable();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp