Browse Source

tests/datawizard/increment_redux_lazy.c: return EXIT_FAILURE on error, do not abort

Nathalie Furmento 13 years ago
parent
commit
46712bca84
1 changed files with 16 additions and 4 deletions
  1. 16 4
      tests/datawizard/increment_redux_lazy.c

+ 16 - 4
tests/datawizard/increment_redux_lazy.c

@@ -228,20 +228,32 @@ int main(int argc, char **argv)
 		ret = starpu_data_acquire(handle, STARPU_R);
 		ret = starpu_data_acquire(handle, STARPU_R);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");
 		var = (unsigned*) starpu_variable_get_local_ptr(handle);
 		var = (unsigned*) starpu_variable_get_local_ptr(handle);
-		STARPU_ASSERT(*var == ntasks*(loop + 1));
 		starpu_data_release(handle);
 		starpu_data_release(handle);
+
+		if (*var != ntasks*(loop + 1))
+		{
+			ret = EXIT_FAILURE;
+			FPRINTF(stderr, "[end of loop] Value %u != Expected value %u\n", *var, ntasks * (loop+1));
+			goto err;
+		}
 	}
 	}
 
 
 	ret = starpu_data_acquire(handle, STARPU_R);
 	ret = starpu_data_acquire(handle, STARPU_R);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");
 	var = (unsigned*) starpu_variable_get_local_ptr(handle);
 	var = (unsigned*) starpu_variable_get_local_ptr(handle);
-	STARPU_ASSERT(*var == ntasks*nloops);
 	starpu_data_release(handle);
 	starpu_data_release(handle);
 	starpu_data_unregister(handle);
 	starpu_data_unregister(handle);
 
 
-	starpu_shutdown();
+	if (*var != ntasks*nloops)
+	{
+		ret = EXIT_FAILURE;
+		FPRINTF(stderr, "Value %u != Expected value %u\n", *var, ntasks * (loop+1));
+		goto err;
+	}
 
 
-	STARPU_RETURN(EXIT_SUCCESS);
+err:
+	starpu_shutdown();
+	STARPU_RETURN(ret);
 
 
 enodev:
 enodev:
 	starpu_data_unregister(handle);
 	starpu_data_unregister(handle);