mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-06 08:35:26 +02:00
Code Issues Wiki Activity

Make sure Arduino intergration tests complete on Windows.

Browse source 
Change-Id: Ia82d07849434376c606885a3728e2eebedfa4428
This commit is contained in:
Doug Schaefer 2016-06-06 23:08:08 -04:00
parent baf20dea39
commit 96ef6bcb78
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
View file

@ -31,6 +31,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.remote.core.IRemoteConnection; import org.eclipse.remote.core.IRemoteConnection;
@ -79,6 +80,12 @@ public class FullIntegration {
boards.add(arduinoManager.getBoard("arduino", "sam", "arduino_due_x_dbg")); boards.add(arduinoManager.getBoard("arduino", "sam", "arduino_due_x_dbg"));
boards.add(arduinoManager.getBoard("Intel", "arc32", "arduino_101")); boards.add(arduinoManager.getBoard("Intel", "arc32", "arduino_101"));
if (Platform.getOS().equals(Platform.OS_WIN32)) {
// i586/i686 link missing
boards.add(arduinoManager.getBoard("Intel", "i586", "izmir_fd"));
boards.add(arduinoManager.getBoard("Intel", "i586", "izmir_fg"));
boards.add(arduinoManager.getBoard("Intel", "i686", "izmir_ec"));
}
return boards; return boards;
} }

2
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
View file

@ -90,7 +90,7 @@ public class ArduinoManager {
return ArduinoPreferences.getArduinoHome().resolve(".version"); //$NON-NLS-1$ return ArduinoPreferences.getArduinoHome().resolve(".version"); //$NON-NLS-1$
} }
private void init() throws CoreException { private synchronized void init() throws CoreException {
if (props == null) { if (props == null) {
if (!Files.exists(ArduinoPreferences.getArduinoHome())) { if (!Files.exists(ArduinoPreferences.getArduinoHome())) {
try { try {