Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | build/android/pylib/instrumentation/instrumentation_test_instance.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
index c90ebf2d9b946b7d931fe246b0fc43be65223736..a7058391b09b06c11a45c766c3cfa983ea5a6146 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
@@ -8,11 +8,12 @@ import android.os.Build;
import android.os.Bundle;
import android.test.AndroidTestRunner;
import android.test.InstrumentationTestRunner;
-import android.util.Log;
import junit.framework.TestCase;
import junit.framework.TestResult;
+import org.chromium.base.Log;
+import org.chromium.base.library_loader.NativeTestLibraries;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.test.reporter.TestStatusListener;
@@ -25,7 +26,15 @@ import java.util.List;
*/
public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
- private static final String TAG = "BaseInstrumentationTestRunner";
+ private static final String TAG = "cr.base.test";
+
+ protected void loadLibraries() {
+ for (String library : NativeTestLibraries.LIBRARIES) {
+ Log.i(TAG, "loading test library: %s", library);
+ System.loadLibrary(library);
+ Log.i(TAG, "loaded test library: %s", library);
+ }
+ }
/**
* An interface for classes that check whether a test case should be skipped.
« no previous file with comments | « base/base.gyp ('k') | build/android/pylib/instrumentation/instrumentation_test_instance.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698