Guest User

Untitled

a guest
May 27th, 2018
92
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.91 KB | None | 0 0
  1. Index: build/library.make
  2. ===================================================================
  3. --- build/library.make (revision 119705)
  4. +++ build/library.make (working copy)
  5. @@ -195,7 +195,7 @@
  6. run-test-local: run-test-lib
  7. run-test-ondotnet-local: run-test-ondotnet-lib
  8.  
  9. -TEST_HARNESS_EXCLUDES = /exclude:NotWorking,ValueAdd,CAS,InetAccess
  10. +TEST_HARNESS_EXCLUDES = -exclude=NotWorking,ValueAdd,CAS,InetAccess
  11. TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS
  12.  
  13. ifdef TEST_HARNESS_VERBOSE
  14. @@ -204,8 +204,8 @@
  15. TEST_HARNESS_POSTPROC = :
  16. TEST_HARNESS_POSTPROC_ONDOTNET = :
  17. else
  18. -TEST_HARNESS_OUTPUT = /output:TestResult-$(PROFILE).log
  19. -TEST_HARNESS_OUTPUT_ONDOTNET = /output:TestResult-ondotnet-$(PROFILE).log
  20. +TEST_HARNESS_OUTPUT = -output=TestResult-$(PROFILE).log
  21. +TEST_HARNESS_OUTPUT_ONDOTNET = -output=TestResult-ondotnet-$(PROFILE).log
  22. TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'
  23. TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'
  24. endif
  25. @@ -217,12 +217,12 @@
  26. ## FIXME: i18n problem in the 'sed' command below
  27. run-test-lib: test-local
  28. ok=:; \
  29. - MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) /xml:TestResult-$(PROFILE).xml $(test_assemblies) $(FIXTURE_ARG) || ok=false; \
  30. + MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(FIXTURE_ARG) || ok=false; \
  31. $(TEST_HARNESS_POSTPROC) ; $$ok
  32.  
  33. run-test-ondotnet-lib: test-local
  34. ok=:; \
  35. - $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
  36. + $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) -xml=TestResult-ondotnet-$(PROFILE).xml || ok=false; \
  37. $(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok
  38. endif
  39.  
  40. Index: class/System/Makefile
  41. ===================================================================
  42. --- class/System/Makefile (revision 119705)
  43. +++ class/System/Makefile (working copy)
  44. @@ -138,8 +138,8 @@
  45. ifeq (net_2_0, $(PROFILE))
  46. pkits_files := $(wildcard Test/System.Security.Cryptography.X509Certificates/pkits/hint)
  47. ifndef pkits_files
  48. -TEST_HARNESS_EXCLUDES = /exclude:NotWorking,ValueAdd,CAS,InetAccess,PKITS
  49. -TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS,PKITS
  50. +TEST_HARNESS_EXCLUDES = -exclude:NotWorking,ValueAdd,CAS,InetAccess,PKITS
  51. +TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude:NotDotNet,CAS,PKITS
  52. endif
  53. endif
Add Comment
Please, Sign In to add comment