diff --git a/tests/mtouch/MTouch.cs b/tests/mtouch/MTouch.cs index 4577b916752f..c707cf8cd19a 100644 --- a/tests/mtouch/MTouch.cs +++ b/tests/mtouch/MTouch.cs @@ -2729,14 +2729,6 @@ public void BuildTestProject (Target target, Profile profile, string subdir, str XBuild.BuildXI (csproj, configuration, platform, timeout: TimeSpan.FromMinutes (15)); } - [Test] - public void ScriptedTests () - { - AssertDeviceAvailable (); - - ExecutionHelper.Execute ("make", new [] { "-C", Path.Combine (Configuration.SourceRoot, "tests", "scripted") }, timeout: TimeSpan.FromMinutes (10)); - } - [Test] // fully linked + llvm (+thumb) + default registrar [TestCase (Target.Dev, MTouchLinker.Unspecified, MTouchRegistrar.Static, "armv7+llvm")] diff --git a/tests/scripted/Makefile b/tests/scripted/Makefile deleted file mode 100644 index defe922062ca..000000000000 --- a/tests/scripted/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -TOP=../.. -include $(TOP)/Make.config - -ALL_TESTS=select-native-compiler bug-13945 bug-35786 - -all-local tests run-tests:: $(ALL_TESTS) - -select-native-compiler: - $(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch arm64 -miphoneos-version-min=$(IOS_SDK_VERSION) -isysroot $(XCODE_DEVELOPER_ROOT)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK_VERSION).sdk -Wall -g -c select-native-compiler/native.cpp -o select-native-compiler/libNative.a - mkdir -p select-native-compiler/SelectNativeCompiler.app - $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/btouch-native select-native-compiler/binding.cs --link-with=select-native-compiler/libNative.a,Native -s:select-native-compiler/managed.cs -o:select-native-compiler/binding.dll - $(SYSTEM_CSC) select-native-compiler/app.cs -r:$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll -r:select-native-compiler/binding.dll -out:select-native-compiler/app.exe - $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/mtouch -r:select-native-compiler/binding.dll select-native-compiler/app.exe --abi=arm64 -sdk "$(IOS_SDK_VERSION)" -dev:select-native-compiler/SelectNativeCompiler.app -sdkroot $(XCODE_DEVELOPER_ROOT) -r:$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll - -bug-13945 bug-35786: - $(MAKE) -C $@ - -.PHONY: $(ALL_TESTS) - -include $(TOP)/mk/rules.mk diff --git a/tests/scripted/bug-13945/.gitignore b/tests/scripted/bug-13945/.gitignore deleted file mode 100644 index 198f6ccbfad3..000000000000 --- a/tests/scripted/bug-13945/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.libs -*.exe -*.dll -*.a -*.m -TheApp.app* -cache* diff --git a/tests/scripted/bug-13945/Makefile b/tests/scripted/bug-13945/Makefile deleted file mode 100644 index b5ddccf23705..000000000000 --- a/tests/scripted/bug-13945/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TOP=../../.. -include $(TOP)/Make.config - -all-local:: bug-13945 - -bug-13945: - @git clean -xfdq - @echo "void foo () {}" > nativeA.m - @echo "void bar () {}" > nativeB.m - @mkdir -p .libs - @$(MAKE) .libs/iphoneos/nativeA.arm64.o - @$(MAKE) .libs/iphoneos/nativeB.arm64.o - @rm -Rf TheApp.app cache cache-first - @mkdir -p TheApp.app - @mkdir -p cache - - @cp .libs/iphoneos/nativeA.arm64.o libNative.a - @$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/btouch-native binding.cs --link-with=libNative.a,Native -s:managed.cs -o:binding.dll - @$(SYSTEM_CSC) app.cs -r:$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll -r:binding.dll -out:app.exe - @$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/mtouch -r:binding.dll app.exe --abi=arm64 -sdk "$(IOS_SDK_VERSION)" -dev:TheApp.app -sdkroot $(XCODE_DEVELOPER_ROOT) --cache=$(shell pwd)/cache -r:$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll - - @cp -Rp cache cache-first - - @cp .libs/iphoneos/nativeB.arm64.o libNative.a - @$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/btouch-native binding.cs --link-with=libNative.a,Native -s:managed.cs -o:binding.dll - # do not rebuild the .exe - @$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/mtouch -r:binding.dll app.exe --abi=arm64 -sdk "$(IOS_SDK_VERSION)" -dev:TheApp.app -sdkroot $(XCODE_DEVELOPER_ROOT) --cache=$(shell pwd)/cache -r:$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll - - # this will verify that binding.dll wasn't AOT'ed again - if binding.dll.arm64.s differ then the AOT compiler executed. - @diff -u cache-first/arm64/binding.dll.s cache/arm64/binding.dll.s - @echo "$@: Success" - -include $(TOP)/mk/rules.mk diff --git a/tests/scripted/bug-13945/app.cs b/tests/scripted/bug-13945/app.cs deleted file mode 100644 index 9f4a84ad6265..000000000000 --- a/tests/scripted/bug-13945/app.cs +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - static void Main () - { - System.Console.WriteLine (typeof (UIKit.UIButton)); - System.Console.WriteLine (typeof (Native)); - } -} diff --git a/tests/scripted/bug-13945/binding.cs b/tests/scripted/bug-13945/binding.cs deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/scripted/bug-13945/managed.cs b/tests/scripted/bug-13945/managed.cs deleted file mode 100644 index 761aa36d2667..000000000000 --- a/tests/scripted/bug-13945/managed.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Foundation; -using ObjCRuntime; - -[assembly: LinkWith ("Native", ForceLoad = true, LinkTarget = LinkTarget.ArmV7)] - -public class Native { -} diff --git a/tests/scripted/bug-35786/.gitignore b/tests/scripted/bug-35786/.gitignore deleted file mode 100644 index 22a3df7ac78b..000000000000 --- a/tests/scripted/bug-35786/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -libs - diff --git a/tests/scripted/bug-35786/Main.cs b/tests/scripted/bug-35786/Main.cs deleted file mode 100644 index 4e92cf266b94..000000000000 --- a/tests/scripted/bug-35786/Main.cs +++ /dev/null @@ -1,7 +0,0 @@ -class M { - static void Main () - { - System.Console.WriteLine (typeof (UIKit.UIWindow)); - All.UseMe (); - } -} diff --git a/tests/scripted/bug-35786/Makefile b/tests/scripted/bug-35786/Makefile deleted file mode 100644 index 4c013f49472d..000000000000 --- a/tests/scripted/bug-35786/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -TOP=../../.. -include $(TOP)/Make.config - -all-local:: bug-35786 - -ITERATIONS=100 -ALL_DLLS:=$(shell printf "libs/C%i.dll " {1..$(ITERATIONS)}) - -libs/C%.cs: Makefile - @echo "public class C$* {}" >> $@ - -libs/C%.dll: libs/C%.cs Makefile - $(SYSTEM_CSC) -target:library $< -out:$@ - -libs/All.cs: Makefile - @echo "public class All {" > $@ - @echo " public static void UseMe ()" >> $@ - @echo " {" >> $@ - @printf " System.Console.WriteLine (typeof (C%i));\n" {1..$(ITERATIONS)} >> $@ - @echo " }" >> $@ - @echo "}" >> $@ - -libs/All.dll.rsp: Makefile - @printf -- "-r:libs/C%i.dll\n" {1..$(ITERATIONS)} > $@ - -libs/All.dll: libs/All.cs libs/All.dll.rsp $(ALL_DLLS) - $(SYSTEM_CSC) -target:library @$@.rsp $< -out:$@ - -libs/bug-35786.exe: Main.cs libs/All.dll - $(SYSTEM_CSC) -target:exe $< -out:$@ -r:libs/All.dll -r:$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll -lib:$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS - -bug-35786: - @git clean -xfdq - @mkdir -p libs - @$(MAKE) -j20 libs/bug-35786.exe - @mkdir -p libs/bug-35786.app - @# ulimit -n=64 works while testing (with the fix for this bug), so use 96 to have some buffer. - @# we lower the ulimit here so that we don't have to create that many assemblies to test with - @# the ulimit default on Yosemite is ulimit=256, which requires 300 assemblies to break the stripper, and 400 assemblies to break the AOT compiler. - @# with 96 here, we only need 20 assemblies to break the stripper, and 35 to break the AOT compiler, so running the test with 100 assemblies should be more than enough. - ulimit -n 96 && $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/mtouch --dev libs/bug-35786.app --targetver=10.3 --abi armv7,arm64 libs/bug-35786.exe --sdkroot $(XCODE_DEVELOPER_ROOT) --sdk $(IOS_SDK_VERSION) -r:$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll - - -include $(TOP)/mk/rules.mk diff --git a/tests/scripted/select-native-compiler/.gitignore b/tests/scripted/select-native-compiler/.gitignore deleted file mode 100644 index 0bc2cb306dad..000000000000 --- a/tests/scripted/select-native-compiler/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.app -*.dSYM -*.a -*.exe -*.dll diff --git a/tests/scripted/select-native-compiler/app.cs b/tests/scripted/select-native-compiler/app.cs deleted file mode 100644 index 9f4a84ad6265..000000000000 --- a/tests/scripted/select-native-compiler/app.cs +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - static void Main () - { - System.Console.WriteLine (typeof (UIKit.UIButton)); - System.Console.WriteLine (typeof (Native)); - } -} diff --git a/tests/scripted/select-native-compiler/binding.cs b/tests/scripted/select-native-compiler/binding.cs deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tests/scripted/select-native-compiler/managed.cs b/tests/scripted/select-native-compiler/managed.cs deleted file mode 100644 index 80701a432a53..000000000000 --- a/tests/scripted/select-native-compiler/managed.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Foundation; -using ObjCRuntime; - -[assembly: LinkWith ("Native", ForceLoad = true, LinkTarget = LinkTarget.ArmV7, IsCxx = true)] - -public class Native { -} diff --git a/tests/scripted/select-native-compiler/native.cpp b/tests/scripted/select-native-compiler/native.cpp deleted file mode 100644 index 983732173a25..000000000000 --- a/tests/scripted/select-native-compiler/native.cpp +++ /dev/null @@ -1,4 +0,0 @@ -void do_cpp_stuff () -{ - throw "exception"; -} \ No newline at end of file