[Esbox-commits] r1184 - in branches/work_Ed: org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests org.maemo.esbox.project.python/src org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-02-01 08:25:46 +0200 (Sun, 01 Feb 2009)
New Revision: 1184

Removed:
   branches/work_Ed/org.maemo.esbox.project.python/src/org/
Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSb1SDKTarget.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDKTarget.java
Log:
Fix SB1 devkit unit test which was adding debian-sarge and breaking apt :)  Add an API that allows setting all the devkits, so we can restore after the test.

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSb1SDKTarget.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSb1SDKTarget.java	2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSb1SDKTarget.java	2009-02-01 06:25:46 UTC (rev 1184)
@@ -84,8 +84,10 @@
 		List<String> targetDevkits = target.getDevkit();
 		String newDevkit = null;
 		for(String tmpDk : devkits){
-			// do not use debian-lenny
-			if(!tmpDk.equals("debian-lenny")&&!targetDevkits.contains(tmpDk)){
+			// do not use debian-lenny or debian-sarge, which mess up the arch name in ARMEL
+			if(!tmpDk.equals("debian-lenny")&&
+					!tmpDk.equals("debian-sarge")&&
+					!targetDevkits.contains(tmpDk)){
 				newDevkit = tmpDk;
 				break;
 			}
@@ -94,8 +96,13 @@
 			return;
 			//fail("Impossible to add new devkit, since target "+target.getName()+" already includes all devkits.");
 		assertTrue(target.addDevkit(newDevkit));
-		targetDevkits = target.getDevkit();
-		assertTrue(targetDevkits.contains(newDevkit));
+		try {
+			List<String> currentDevkits = target.getDevkit();
+			assertTrue(currentDevkits.contains(newDevkit));
+		} finally {
+			// restore
+			target.setDevkits(targetDevkits);
+		}
 	}
 	
 	

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java	2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDKTarget.java	2009-02-01 06:25:46 UTC (rev 1184)
@@ -121,7 +121,7 @@
 			return false;
 		else if (possibleDK.contains(newDevkit)) {
 			existingDK.add(newDevkit);
-			doAddDevkits(existingDK);
+			setDevkits(existingDK);
 			return true;
 		}
 		throw new MicaException("No such devkit: " + newDevkit);
@@ -138,10 +138,10 @@
 			}
 		}
 		dtToAdd.addAll(existingDK);
-		doAddDevkits(dtToAdd);
+		setDevkits(dtToAdd);
 	}
 
-	private void doAddDevkits(List<String> existingDK) throws MicaException {
+	public void setDevkits(List<String> existingDK) throws MicaException {
 		IScratchbox1SDK sdk = (IScratchbox1SDK) this.getSDK();
 		sdk.createTarget(this.getName(), this.getCompiler(), existingDK, this
 				.getCputransp(), true);

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDKTarget.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDKTarget.java	2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/scratchbox/sb1/sdk/IScratchbox1SDKTarget.java	2009-02-01 06:25:46 UTC (rev 1184)
@@ -26,4 +26,7 @@
 	boolean addDevkit(String newDevkits) throws MicaException;
 
 	public void addDevkits(List<String> newDevkits) throws MicaException;
+
+	void setDevkits(List<String> devkits) throws MicaException;
+
 }