1 files changed, 11 insertions, 15 deletions
diff --git a/tools/nnapi_test/src/nnapi_test.cc b/tools/nnapi_test/src/nnapi_test.cc
index 515311a3c..1f98bb07d 100644
--- a/tools/nnapi_test/src/nnapi_test.cc
+++ b/tools/nnapi_test/src/nnapi_test.cc
@@ -14,27 +14,20 @@
  * limitations under the License.
  */
 
-#include "tensorflow/contrib/lite/kernels/register.h"
+#include "support/tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "util/environment.h"
-
 #include "support/tflite/interp/FlatBufferBuilder.h"
 #include "support/tflite/Diff.h"
 
 #include <iostream>
+#include <stdexcept>
 
 using namespace tflite;
 using namespace tflite::ops::builtin;
 
 int main(const int argc, char **argv)
 {
-  int verbose = 0;
-  int tolerance = 1;
-
-  nnfw::util::env::IntAccessor("VERBOSE").access(verbose);
-  nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance);
-
   if (argc < 2)
   {
     std::cerr << "nnapi_test\n\n";
@@ -50,10 +43,13 @@ int main(const int argc, char **argv)
 
   const nnfw::support::tflite::interp::FlatBufferBuilder builder(*model);
 
-  RandomTestParam param;
-
-  param.verbose = verbose;
-  param.tolerance = tolerance;
-
-  return RandomTestRunner{0, param}.run(builder);
+  try
+  {
+    return RandomTestRunner::make(0).run(builder);
+  }
+  catch (const std::exception &e)
+  {
+    std::cerr << e.what() << std::endl;
+    return 1;
+  }
 }