Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated

1 files changed, 22 insertions, 0 deletions

diff --git a/platform/ios/test/common/ViewController.m b/platform/ios/test/common/ViewController.m
new file mode 100644
index 0000000000..e9c526122a
--- /dev/null
+++ b/platform/ios/test/common/ViewController.m
@@ -0,0 +1,22 @@
+#import "ViewController.h"
+#import "iosTestRunner.h"
+
+@interface ViewController ()
+{
+    IosTestRunner* i;
+}
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+//  In order to run test runner with app itself instead of with unit test, comment out the following line.
+//  i = [[IosTestRunner alloc]init];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+@end