diff options
author | lbsa71 | 2009-02-19 18:01:33 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-19 18:01:33 +0000 |
commit | 06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38 (patch) | |
tree | 876de8f4db442a7822c73d97a20ef86ca8842e19 /Prebuild/tests | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=3193 (diff) | |
download | opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.zip opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.gz opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.bz2 opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.xz |
* Okay, so finally got my head around this. Problem is that upstream Prebuild copied dlls promiscuously, and this led to the references being all mixed up (/bin dlls overwritten by different versions on every csc)
* Something that thus needs fixing is the fact that ProjectReferences has to be marked
<ProjectReference>
<Private>False</Private>
</ProjectReference>
but that is not configurable in the upstream Xml Schema. I've hardcoded it in our repo for now.
Diffstat (limited to 'Prebuild/tests')
-rw-r--r-- | Prebuild/tests/Makefile | 24 | ||||
-rw-r--r-- | Prebuild/tests/README.txt | 5 | ||||
-rw-r--r-- | Prebuild/tests/include-001.expected | 46 | ||||
-rw-r--r-- | Prebuild/tests/include-001.include | 33 | ||||
-rw-r--r-- | Prebuild/tests/include-001.prebuild | 22 | ||||
-rw-r--r-- | Prebuild/tests/include-002-2.include | 8 | ||||
-rw-r--r-- | Prebuild/tests/include-002.expected | 26 | ||||
-rw-r--r-- | Prebuild/tests/include-002.include | 14 | ||||
-rw-r--r-- | Prebuild/tests/include-002.prebuild | 7 |
9 files changed, 185 insertions, 0 deletions
diff --git a/Prebuild/tests/Makefile b/Prebuild/tests/Makefile new file mode 100644 index 0000000..4a8ddf4 --- /dev/null +++ b/Prebuild/tests/Makefile | |||
@@ -0,0 +1,24 @@ | |||
1 | # | ||
2 | # Executable | ||
3 | # | ||
4 | |||
5 | # Executables | ||
6 | PREBUILD = mono ../src/bin/Release/prebuild.exe /target makefile | ||
7 | |||
8 | # Files | ||
9 | PREBUILDS = $(wildcard *.prebuild) | ||
10 | RESULTS = $(PREBUILDS:prebuild=results) | ||
11 | TESTS = $(PREBUILDS:prebuild=test) | ||
12 | |||
13 | all: $(TESTS) | ||
14 | |||
15 | clean: | ||
16 | rm -f *~ *.log | ||
17 | rm -f $(RESULTS) | ||
18 | |||
19 | %.test: %.prebuild | ||
20 | $(PREBUILD) /log $*.log /file $*.prebuild /ppi $*.results >& /dev/null | ||
21 | if ! cmp $*.expected $*.results; then \ | ||
22 | echo $*.prebuild failed; \ | ||
23 | false; \ | ||
24 | fi | ||
diff --git a/Prebuild/tests/README.txt b/Prebuild/tests/README.txt new file mode 100644 index 0000000..2c2de3b --- /dev/null +++ b/Prebuild/tests/README.txt | |||
@@ -0,0 +1,5 @@ | |||
1 | There are some tests that are run via a Makfile in this | ||
2 | directory. They haven't been included in any form of unit tests, but | ||
3 | they are there to help test the functionality in some what. Simply | ||
4 | build prebuild (so there is a src/bin/Release/prebuild.exe) and type | ||
5 | `make` in this directory. Everything should pass without errors. | ||
diff --git a/Prebuild/tests/include-001.expected b/Prebuild/tests/include-001.expected new file mode 100644 index 0000000..26374b5 --- /dev/null +++ b/Prebuild/tests/include-001.expected | |||
@@ -0,0 +1,46 @@ | |||
1 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | ||
2 | <Solution name="include-001" version="1.2.3"> | ||
3 | <Configuration name="Debug"> | ||
4 | <Options> | ||
5 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
6 | <OptimizeCode>false</OptimizeCode> | ||
7 | <OutputPath>bin/Debug</OutputPath> | ||
8 | <DebugInformation>true</DebugInformation> | ||
9 | </Options> | ||
10 | </Configuration> | ||
11 | <Configuration name="Release"> | ||
12 | <Options> | ||
13 | <CompilerDefines>TRACE</CompilerDefines> | ||
14 | <OutputPath>bin/Release</OutputPath> | ||
15 | <OptimizeCode>true</OptimizeCode> | ||
16 | <DebugInformation>false</DebugInformation> | ||
17 | </Options> | ||
18 | </Configuration> | ||
19 | <Project name="Prebuild" path="src" language="C#" assemblyName="include-001" type="Exe" version="1.2.3" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> | ||
20 | <Configuration name="Debug"> | ||
21 | <Options> | ||
22 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
23 | <OptimizeCode>false</OptimizeCode> | ||
24 | <OutputPath>bin/Debug</OutputPath> | ||
25 | <DebugInformation>true</DebugInformation> | ||
26 | <KeyFile>Prebuild.snk</KeyFile> | ||
27 | <SuppressWarnings>1595</SuppressWarnings> | ||
28 | </Options> | ||
29 | </Configuration> | ||
30 | <Configuration name="Release"> | ||
31 | <Options> | ||
32 | <CompilerDefines>TRACE</CompilerDefines> | ||
33 | <OutputPath>bin/Release</OutputPath> | ||
34 | <OptimizeCode>true</OptimizeCode> | ||
35 | <DebugInformation>false</DebugInformation> | ||
36 | <KeyFile>Prebuild.snk</KeyFile> | ||
37 | <SuppressWarnings>1595</SuppressWarnings> | ||
38 | </Options> | ||
39 | </Configuration> | ||
40 | <Reference name="System" /> | ||
41 | <Files> | ||
42 | <Match pattern="*.cs" recurse="true" /> | ||
43 | </Files> | ||
44 | </Project> | ||
45 | </Solution> | ||
46 | </Prebuild> | ||
diff --git a/Prebuild/tests/include-001.include b/Prebuild/tests/include-001.include new file mode 100644 index 0000000..7f75962 --- /dev/null +++ b/Prebuild/tests/include-001.include | |||
@@ -0,0 +1,33 @@ | |||
1 | <Project name="Prebuild" | ||
2 | path="src" | ||
3 | language="C#" | ||
4 | assemblyName="include-001" | ||
5 | type="Exe" | ||
6 | version="1.2.3" | ||
7 | xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" | ||
8 | > | ||
9 | <Configuration name="Debug"> | ||
10 | <Options> | ||
11 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
12 | <OptimizeCode>false</OptimizeCode> | ||
13 | <OutputPath>bin/Debug</OutputPath> | ||
14 | <DebugInformation>true</DebugInformation> | ||
15 | <KeyFile>Prebuild.snk</KeyFile> | ||
16 | <SuppressWarnings>1595</SuppressWarnings> | ||
17 | </Options> | ||
18 | </Configuration> | ||
19 | <Configuration name="Release"> | ||
20 | <Options> | ||
21 | <CompilerDefines>TRACE</CompilerDefines> | ||
22 | <OutputPath>bin/Release</OutputPath> | ||
23 | <OptimizeCode>true</OptimizeCode> | ||
24 | <DebugInformation>false</DebugInformation> | ||
25 | <KeyFile>Prebuild.snk</KeyFile> | ||
26 | <SuppressWarnings>1595</SuppressWarnings> | ||
27 | </Options> | ||
28 | </Configuration> | ||
29 | <Reference name="System" /> | ||
30 | <Files> | ||
31 | <Match pattern="*.cs" recurse="true"/> | ||
32 | </Files> | ||
33 | </Project> | ||
diff --git a/Prebuild/tests/include-001.prebuild b/Prebuild/tests/include-001.prebuild new file mode 100644 index 0000000..8047008 --- /dev/null +++ b/Prebuild/tests/include-001.prebuild | |||
@@ -0,0 +1,22 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | ||
3 | <Solution name="include-001" version="1.2.3"> | ||
4 | <Configuration name="Debug"> | ||
5 | <Options> | ||
6 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
7 | <OptimizeCode>false</OptimizeCode> | ||
8 | <OutputPath>bin/Debug</OutputPath> | ||
9 | <DebugInformation>true</DebugInformation> | ||
10 | </Options> | ||
11 | </Configuration> | ||
12 | <Configuration name="Release"> | ||
13 | <Options> | ||
14 | <CompilerDefines>TRACE</CompilerDefines> | ||
15 | <OutputPath>bin/Release</OutputPath> | ||
16 | <OptimizeCode>true</OptimizeCode> | ||
17 | <DebugInformation>false</DebugInformation> | ||
18 | </Options> | ||
19 | </Configuration> | ||
20 | <?include file="include-001.include"?> | ||
21 | </Solution> | ||
22 | </Prebuild> | ||
diff --git a/Prebuild/tests/include-002-2.include b/Prebuild/tests/include-002-2.include new file mode 100644 index 0000000..661b7f3 --- /dev/null +++ b/Prebuild/tests/include-002-2.include | |||
@@ -0,0 +1,8 @@ | |||
1 | <Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> | ||
2 | <Options> | ||
3 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
4 | <OptimizeCode>false</OptimizeCode> | ||
5 | <OutputPath>bin/Debug</OutputPath> | ||
6 | <DebugInformation>true</DebugInformation> | ||
7 | </Options> | ||
8 | </Configuration> | ||
diff --git a/Prebuild/tests/include-002.expected b/Prebuild/tests/include-002.expected new file mode 100644 index 0000000..9849658 --- /dev/null +++ b/Prebuild/tests/include-002.expected | |||
@@ -0,0 +1,26 @@ | |||
1 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | ||
2 | <Solution name="include-002" version="1.2.3"> | ||
3 | <Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> | ||
4 | <Options> | ||
5 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
6 | <OptimizeCode>false</OptimizeCode> | ||
7 | <OutputPath>bin/Debug</OutputPath> | ||
8 | <DebugInformation>true</DebugInformation> | ||
9 | </Options> | ||
10 | </Configuration> | ||
11 | <Project name="Prebuild" path="src" language="C#" assemblyName="include-001" type="Exe" version="1.2.3" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> | ||
12 | <Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> | ||
13 | <Options> | ||
14 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | ||
15 | <OptimizeCode>false</OptimizeCode> | ||
16 | <OutputPath>bin/Debug</OutputPath> | ||
17 | <DebugInformation>true</DebugInformation> | ||
18 | </Options> | ||
19 | </Configuration> | ||
20 | <Reference name="System" /> | ||
21 | <Files> | ||
22 | <Match pattern="*.cs" recurse="true" /> | ||
23 | </Files> | ||
24 | </Project> | ||
25 | </Solution> | ||
26 | </Prebuild> | ||
diff --git a/Prebuild/tests/include-002.include b/Prebuild/tests/include-002.include new file mode 100644 index 0000000..64f4058 --- /dev/null +++ b/Prebuild/tests/include-002.include | |||
@@ -0,0 +1,14 @@ | |||
1 | <Project name="Prebuild" | ||
2 | path="src" | ||
3 | language="C#" | ||
4 | assemblyName="include-001" | ||
5 | type="Exe" | ||
6 | version="1.2.3" | ||
7 | xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" | ||
8 | > | ||
9 | <?include file="include-002-2.include"?> | ||
10 | <Reference name="System" /> | ||
11 | <Files> | ||
12 | <Match pattern="*.cs" recurse="true"/> | ||
13 | </Files> | ||
14 | </Project> | ||
diff --git a/Prebuild/tests/include-002.prebuild b/Prebuild/tests/include-002.prebuild new file mode 100644 index 0000000..9e85f20 --- /dev/null +++ b/Prebuild/tests/include-002.prebuild | |||
@@ -0,0 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | ||
3 | <Solution name="include-002" version="1.2.3"> | ||
4 | <?include file="include-002-2.include"?> | ||
5 | <?include file="include-002.include"?> | ||
6 | </Solution> | ||
7 | </Prebuild> | ||