Merge remote-tracking branch 'arduino/master'

Me No Dev · Me No Dev · commit 85e897a079ab · 2016-02-08T00:50:43.000+02:00
diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
@@ -111,12 +111,12 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 			OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-mingw32.zip"},
 			OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-apple-darwin.zip"},
 		}},
-		Tool{Name: "ctags", Version: "5.8-arduino6",
+		Tool{Name: "ctags", Version: "5.8-arduino7",
 			OsUrls: []OsUrl{
-				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino6-i686-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino6-x86_64-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino6-i686-mingw32.zip"},
-				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino6-x86_64-apple-darwin.zip"},
+				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-i686-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-x86_64-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-i686-mingw32.zip"},
+				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino7-x86_64-apple-darwin.zip"},
 			}},
 	}
 
diff --git a/src/arduino.cc/builder/test/sketch_with_enum_class/sketch_with_enum_class.ino b/src/arduino.cc/builder/test/sketch_with_enum_class/sketch_with_enum_class.ino
@@ -0,0 +1,19 @@
+void test() {
+  test2();
+}
+
+enum class MyEnum
+{
+  AValue = 0,
+  AnotherValue = 1
+};
+
+void test2() {
+}
+
+void setup() {
+}
+
+void loop() {
+}
+
diff --git a/src/arduino.cc/builder/test/try_build_of_problematic_sketch_test.go b/src/arduino.cc/builder/test/try_build_of_problematic_sketch_test.go
@@ -181,6 +181,10 @@ func TestTryBuild034(t *testing.T) {
 	tryBuild(t, "sketch_with_static_asserts", "sketch_with_static_asserts.ino")
 }
 
+func TestTryBuild035(t *testing.T) {
+	tryBuild(t, "sketch_with_enum_class", "sketch_with_enum_class.ino")
+}
+
 func makeDefaultContext(t *testing.T) map[string]interface{} {
 	DownloadCoresAndToolsAndLibraries(t)
 

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,10 @@ func TestTryBuild034(t *testing.T) {`
`181`	`181`	`tryBuild(t, "sketch_with_static_asserts", "sketch_with_static_asserts.ino")`
`182`	`182`	`}`
`183`	`183`
	`184`	`+func TestTryBuild035(t *testing.T) {`
	`185`	`+ tryBuild(t, "sketch_with_enum_class", "sketch_with_enum_class.ino")`
	`186`	`+}`
	`187`	`+`
`184`	`188`	`func makeDefaultContext(t *testing.T) map[string]interface{} {`
`185`	`189`	`DownloadCoresAndToolsAndLibraries(t)`
`186`	`190`