Skip to content
Snippets Groups Projects
Commit 3b518ee6 authored by Jeno Attila Balasko's avatar Jeno Attila Balasko Committed by Gerrit Code Review
Browse files

Merge "Fixed splitting from tpd test with dynamic linking"

parents 6200a6e0 dafaab26
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
regression_test/compileonly/mfgen-tpd/splitting/Makefile
+ 6
− 6
View file @ 3b518ee6
......@@ -22,7 +22,7 @@ MAKEPROG := ${MAKE}
all: Normal Recursive RecursiveDynamic
Normal:
cd a && \
rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -f $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -b None && cd binDefault && make && cd .. && rm -rf binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -f $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
......@@ -31,7 +31,7 @@ Normal:
-t a.tpd -b Number && cd binDefault && make && cd .. && rm -rf binDefault
Recursive:
cd a && \
rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -rgpcb None && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
......@@ -43,15 +43,15 @@ Recursive:
rm -rf binDefault ../b/binDefault ../c/binDefault
RecursiveDynamic:
cd a && \
rm -rf binDefault ../b/binDefault ../c/binDefault && cd a && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -rcplb None && cd binDefault && make && cd .. && \
-t a.tpd -rcpb None-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -rcplb Type && cd binDefault && make && cd .. && \
-t a.tpd -rcpb Type-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault && \
$(TTCN3_DIR)/bin/ttcn3_makefilegen -F $(MFGEN_FLAGS) $(COVERAGE_FLAG) \
-t a.tpd -rcplb Number && cd binDefault && make && cd .. && \
-t a.tpd -rcpb Number-Dyn && cd binDefault && make && cd .. && \
rm -rf binDefault ../b/binDefault ../c/binDefault
......
regression_test/compileonly/mfgen-tpd/splitting/a/a.tpd
+ 55
− 10
View file @ 3b518ee6
......@@ -46,10 +46,10 @@
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Empty">
<Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
<codeSplitting></codeSplitting>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
......@@ -58,18 +58,62 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
<requiredConfiguration>Empty</requiredConfiguration>
<requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Empty</requiredConfiguration>
<requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Type">
<Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
<requiredConfiguration>Number</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Number</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="None-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>none</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
<requiredConfiguration>None-Dyn</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>None-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Type-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......@@ -79,18 +123,19 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
<requiredConfiguration>Type</requiredConfiguration>
<requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Type</requiredConfiguration>
<requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Number">
<Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......@@ -100,11 +145,11 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>b</projectName>
<requiredConfiguration>Number</requiredConfiguration>
<requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Number</requiredConfiguration>
<requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
......
regression_test/compileonly/mfgen-tpd/splitting/b/b.tpd
+ 44
− 7
View file @ 3b518ee6
......@@ -41,10 +41,10 @@
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Empty">
<Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
<codeSplitting></codeSplitting>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
......@@ -53,14 +53,50 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Empty</requiredConfiguration>
<requiredConfiguration>Type</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Type">
<Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Number</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="None-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>none</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>None-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Type-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......@@ -70,14 +106,15 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Type</requiredConfiguration>
<requiredConfiguration>Type-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
</Configuration>
<Configuration name="Number">
<Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......@@ -87,7 +124,7 @@
<ConfigurationRequirements>
<configurationRequirement>
<projectName>c</projectName>
<requiredConfiguration>Number</requiredConfiguration>
<requiredConfiguration>Number-Dyn</requiredConfiguration>
</configurationRequirement>
</ConfigurationRequirements>
</ProjectProperties>
......
regression_test/compileonly/mfgen-tpd/splitting/c/c.tpd
+ 29
− 4
View file @ 3b518ee6
......@@ -32,10 +32,10 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
<Configuration name="Empty">
<Configuration name="Type">
<ProjectProperties>
<MakefileSettings>
<codeSplitting></codeSplitting>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
......@@ -43,9 +43,33 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
<Configuration name="Type">
<Configuration name="Number">
<ProjectProperties>
<MakefileSettings>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
<Configuration name="None-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>none</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
<LocalBuildSettings>
<workingDirectory>binDefault</workingDirectory>
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
<Configuration name="Type-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>type</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......@@ -54,9 +78,10 @@
</LocalBuildSettings>
</ProjectProperties>
</Configuration>
<Configuration name="Number">
<Configuration name="Number-Dyn">
<ProjectProperties>
<MakefileSettings>
<dynamicLinking>true</dynamicLinking>
<codeSplitting>5</codeSplitting>
<targetExecutable>binDefault/binDefault</targetExecutable>
</MakefileSettings>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent