[Pkg-cli-apps-commits] [fsharp] 31/71: remore use of relative links for resources

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.0
in repository fsharp.

commit 5aa40ed77a6bc97f3a7ca019cb20bb3fdff082af
Author: Don Syme <donsyme at fastmail.fm>
Date:   Fri Nov 29 17:32:03 2013 +0000

    remore use of relative links for resources
---
 src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj |   4 +-
 src/fsharp/FSharp.Core/FSharp.Core.fsproj         |   2 +-
 tests/fsharp/core/all.fsx                         | 149 ++++++++++++++++++++++
 tests/fsharp/core/all.sh                          |   2 +
 4 files changed, 154 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
index 7318fed..41cd174 100644
--- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
+++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
@@ -25,10 +25,10 @@
       <Link>assemblyinfo.FSharp.Compiler.dll.fs</Link>
     </Compile>
     <FsSrGen Include="..\FSComp.txt">
-      <Link>ErrorText/FSComp.txt</Link>
+      <Link>FSComp.txt</Link>
     </FsSrGen>
     <EmbeddedResource Include="..\FSStrings.resx">
-      <Link>ErrorText/FSStrings.resx</Link>
+      <Link>FSStrings.resx</Link>
     </EmbeddedResource>
     <Compile Include="..\..\utils\sformat.fsi">
       <Link>ErrorText/sformat.fsi</Link>
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index ec3cc0a..2108613 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
   <ItemGroup>
     <EmbeddedResource Include="FSCore.resx">
-      <Link>Primitives/FSCore.resx</Link>
+      <Link>FSCore.resx</Link>
     </EmbeddedResource>
     <Compile Include="prim-types-prelude.fsi">
       <Link>Primitives/prim-types-prelude.fsi</Link>
diff --git a/tests/fsharp/core/all.fsx b/tests/fsharp/core/all.fsx
new file mode 100644
index 0000000..6407038
--- /dev/null
+++ b/tests/fsharp/core/all.fsx
@@ -0,0 +1,149 @@
+
+
+let mutable allErrors = []
+
+let check (dir:string) f = 
+    System.Console.Write("Running {0}....", dir)
+    let errors = try f() with e -> [e.ToString()]
+    allErrors <- allErrors @ [ for e in errors -> (dir,e) ]
+    match errors with 
+    | [] -> System.Console.WriteLine("OK") 
+    | _ -> 
+        System.Console.WriteLine "" 
+        System.Console.WriteLine "" 
+        System.Console.WriteLine "-------------------" 
+        System.Console.WriteLine("Failures in {0}",dir) 
+        for error in errors do 
+            System.Console.WriteLine("    FAILED: {0}",error)
+        System.Console.WriteLine "-------------------" 
+        System.Console.WriteLine "" 
+
+
+(*
+#load "queriesCustomQueryOps/test.fsx"
+#load "queriesLeafExpressionConvert/test.fsx"
+#load "queriesNullableOperators/test.fsx"
+#load "queriesOverIEnumerable/test.fsx"
+#load "queriesOverIQueryable/test.fsx"
+
+check "queriesCustomQueryOps/test.fsx" Core_queriesCustomQueryOps.RUN
+check "queriesLeafExpressionConvert/test.fsx" Core_queriesLeafExpressionConvert.RUN
+check "queriesNullableOperators/test.fsx" Core_queriesNullableOperators.RUN
+check "queriesOverIEnumerable/test.fsx" Core_queriesOverIEnumerable.RUN
+check "queriesOverIQueryable/test.fsx" Core_queriesOverIQueryable.RUN
+*)
+
+(*
+#load "subtype/test.fsx"
+#load "syntax/test.fsx"
+#load "tlr/test.fsx"
+#load "unicode/test.fsx"
+
+check "subtype" Core_subtype.RUN
+check "syntax" (fun () -> if Core_syntax.RUN() then ["FAILED"] else [])
+check "tlr" Core_tlr.RUN
+check "unicode" Core_unicode.RUN
+*)
+
+(*
+#load "quotes/test.fsx"
+#load "quotesDebugInfo/test.fsx"
+#load "seq/test.fsx"
+#load "nested/test.fsx"
+#load "patterns/test.fsx"
+#load "printf/test.fsx"
+
+check "quotes/test.fsx" Core_quotes.RUN
+check "quotesDebugInfo/test.fsx" (fun () -> match Test.RUN() with 0 -> [] | n -> [sprintf "%d failures" n])
+check "seq/test.fsx" Core_seq.RUN
+check "nested/test.fsx" Core_nested.RUN
+check "patterns/test.fsx" Core_patterns.RUN
+check "printf/test.fsx" Core_printf.RUN
+*)
+
+#load "lift/test.fsx"
+#load "members/basics/test-hw.fsx"
+#load "members/ctree/test.fsx"
+#load "members/factors/test.fsx"
+#load "members/incremental/test-hw.fsx"
+#load "members/incremental/test.fsx"
+#load "members/ops/test.fsx"
+
+check "lift" Core_lift.RUN
+check "members/basics/test.fsx" Core_members_basics.RUN
+check "members/ctree/test.fsx" Core_members_ctree.RUN
+check "members/factors/test.fsx" Core_members_factors.RUN
+check "members/incremental/test.fsx" Core_members_incremental.RUN
+check "members/incremental/test-hw.fsx" Core_members_incremental_testhw.RUN
+check "members/ops/test.fsx" Core_members_ops.RUN
+
+(*
+#load "longnames/test.fsx"
+#load "map/test.fsx"
+#load "lazy/test.fsx"
+#load "letrec/test.fsx"
+#load "libtest/test.fsx"
+#load "int32/test.fsx"
+#load "innerpoly/test.fsx"
+
+#load "comprehensions/test.fsx"
+#load "attributes/test.fsx"
+#load "array/test.fsx"
+#load "apporder/test.fsx"
+#load "access/test.fsx"
+
+
+check "access" Core_access.RUN
+check "apporder" Core_apporder.RUN
+check "array" Core_array.RUN
+check "attributes" Core_attributes.RUN
+check "comprehensions" Core_comprehensions.RUN
+check "innerpoly" Core_innerpoly.RUN
+check "int32" Core_int32.RUN
+check "lazy" Core_lazy.RUN
+check "libtest" Core_libtest.RUN
+check "letrec" Core_letrec.RUN
+check "longnames" Core_longnames.RUN
+check "map" Core_map.RUN
+*)
+match allErrors with 
+| [] -> 
+    System.Console.WriteLine("ALL PASSED!")
+    exit 0
+| _ -> 
+    for (dir,err) in allErrors do
+        System.Console.WriteLine("FAILURE: {0} - {1}", dir, err)
+    exit 1
+
+// ----------------------------------
+
+(*
+#load "csext/test.fsx"
+#load "fsfromfsviacs/test.fsx"
+#load "fsiAndModifiers/test.fsx"
+#load "genericmeasures/test.fsx"
+#load "load-script/test.fsx"
+#load "members/console/test.fsx"
+#load "math/lalgebra/test.fsx"
+#load "math/lapack/test.fsx"
+#load "math/numbers/test.fsx"
+#load "math/numbersVS2008/test.fsx"
+#load "measures/test.fsx"
+#load "mscorlib/test.fsx"
+#load "pinvoke/test.fsx"
+#load "portable/portablelibrary/test.fsx"
+#load "printing/test.fsx"
+#load "queriesOverIQueryableLinqToEntities/test.fsx"
+#load "queriesOverIQueryableLinqToSql/test.fsx"
+#load "queriesOverOData/test.fsx"
+#load "quotesInMultipleModules/test.fsx"
+#load "topinit/test.fsx"
+
+
+#load "control/test.fsx"
+#load "controlChamenos/test.fsx"
+#load "controlMailbox/test.fsx"
+#load "controlStackOverflow/test.fsx"
+#load "controlWebExt/test.fsx"
+#load "controlWpf/test.fsx"
+*)
diff --git a/tests/fsharp/core/all.sh b/tests/fsharp/core/all.sh
new file mode 100644
index 0000000..dcfe1d3
--- /dev/null
+++ b/tests/fsharp/core/all.sh
@@ -0,0 +1,2 @@
+mono ../../../lib/debug/fsc.exe --define:Portable --define:MONO --define:UNIX --define:ALL_IN_ONE --quotations-debug+ --debug+ ./all.fsx && mono ./all.exe
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git