Fix the problem where MicaZ failed the test

diff --git a/apps/tosthreads/apps/TestBlockStorage/Makefile b/apps/tosthreads/apps/TestBlockStorage/Makefile
index f4a0d1d3aa4299e0e27f554d3e4768f046609997..6861fb769cdb9f4a8d8084218a6719fe98b69217 100644 (file)
--- a/apps/tosthreads/apps/TestBlockStorage/Makefile
+++ b/apps/tosthreads/apps/TestBlockStorage/Makefile
@@ -1,3 +1,10 @@
 COMPONENT=TestBlockStorageAppC
 
+ifneq ($(filter telosb,$(MAKECMDGOALS)),)
+  CFLAGS+=-DUSE_STM25P
+endif
+ifneq ($(filter micaz,$(MAKECMDGOALS)),)
+  CFLAGS+=-DUSE_AT45DB
+endif
+
 include $(MAKERULES)

diff --git a/apps/tosthreads/apps/TestBlockStorage/TestBlockStorageP.nc b/apps/tosthreads/apps/TestBlockStorage/TestBlockStorageP.nc
index 757212794a7fc56147aa6cac13cbc7fe4d5c60aa..316cbece9354112837c1a8083fa938e4c2298d30 100644 (file)
--- a/apps/tosthreads/apps/TestBlockStorage/TestBlockStorageP.nc
+++ b/apps/tosthreads/apps/TestBlockStorage/TestBlockStorageP.nc
@@ -47,10 +47,15 @@ implementation
   {
     int i;
     error_t error;
+#if defined USE_AT45DB
+    storage_len_t expectedVolumeSize = 262144;
+#elif defined USE_STM25P
+    storage_len_t expectedVolumeSize = 1048576;
+#endif
 
     call Leds.set(1);
 
-    if (call BlockingBlock1.getSize() != 1048576) {
+    if (call BlockingBlock1.getSize() != expectedVolumeSize) {
       call Leds.set(7);
       return;
     }
@@ -61,7 +66,7 @@ implementation
       return;
     }
     
-    for (i = 0; i < 20; i++) {
+    for (i = 0; i < 50; i++) {
       storage_addr_t writeAddr = call Random.rand32() % (call BlockingBlock1.getSize() - sizeof(storage_addr_t));
       storage_len_t len = sizeof(storage_addr_t);
       storage_addr_t readBuf;