diff options
| author | Björn Gustavsson <[email protected]> | 2010-03-10 07:14:46 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-03-11 10:26:48 +0100 |
| commit | dc1e683111376624644a9a60df86cb341f7a554d (patch) | |
| tree | cc9d3ba7372da7f6bb86ba333c7d5b6bed268e08 /lib/asn1/test | |
| parent | a3202b05d648732b7d2afe3ad952782e5376a18d (diff) | |
| download | otp-dc1e683111376624644a9a60df86cb341f7a554d.tar.gz otp-dc1e683111376624644a9a60df86cb341f7a554d.tar.bz2 otp-dc1e683111376624644a9a60df86cb341f7a554d.zip | |
asn1 tests: Don't refer to $ERL_TOP in compiler options
On Windows, $ERL_TOP contains a cygwin-style pathname
that can be used in Makefiles to (for instance) include
other Makefiles, but must not be passed to non-cygwin programs
such as "erlc". Therefore, using compiler options such as
"-I $(ERL_TOP)/lib/test_server/include" will not work on
Windows.
Fix this problem by include "test_server.hrl" using
-include_lib() instead of -include(). That works because
-include_lib() searches for include files in the code path
without the need for any -I options.
Diffstat (limited to 'lib/asn1/test')
92 files changed, 91 insertions, 93 deletions
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 879e51c632..879447e816 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -145,8 +145,6 @@ RELSYSDIR = $(RELEASE_PATH)/asn1_test # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- -ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \ - -I$(ERL_TOP)/lib/kernel/include EBIN = . diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src index 53a5cc5284..9d3f03fc4c 100644 --- a/lib/asn1/test/asn1_SUITE.erl.src +++ b/lib/asn1/test/asn1_SUITE.erl.src @@ -48,7 +48,7 @@ -compile(export_all). %%-export([Function/Arity, ...]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). %% records used by test-case default -record('Def1',{ diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl index 2884c79216..26cbdeb940 100644 --- a/lib/asn1/test/asn1_test_lib.erl +++ b/lib/asn1/test/asn1_test_lib.erl @@ -22,7 +22,7 @@ -export([ticket_7407_compile/2,ticket_7407_code/1, ticket_7678/2, ticket_7708/2, ticket_7763/1, ticket_7876/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). ticket_7407_compile(Config,Option) -> diff --git a/lib/asn1/test/ber_decode_error.erl b/lib/asn1/test/ber_decode_error.erl index aa3b0122fd..494dc06931 100644 --- a/lib/asn1/test/ber_decode_error.erl +++ b/lib/asn1/test/ber_decode_error.erl @@ -21,7 +21,7 @@ -export([run/1, compile/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/choice_extension.erl b/lib/asn1/test/choice_extension.erl index 843704ee9e..862f088d5f 100644 --- a/lib/asn1/test/choice_extension.erl +++ b/lib/asn1/test/choice_extension.erl @@ -21,7 +21,7 @@ -export([run/0, compile/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl index 60d2c39be0..67025a1bad 100644 --- a/lib/asn1/test/h323test.erl +++ b/lib/asn1/test/h323test.erl @@ -21,7 +21,7 @@ -compile(export_all). -export([compile/3,run/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> ?line DataDir = ?config(data_dir,Config), diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl index 125dfaa3bd..00d6e4ca24 100644 --- a/lib/asn1/test/testChoExtension.erl +++ b/lib/asn1/test/testChoExtension.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([extension/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testChoExternal.erl b/lib/asn1/test/testChoExternal.erl index 5f804d9d7f..909290a289 100644 --- a/lib/asn1/test/testChoExternal.erl +++ b/lib/asn1/test/testChoExternal.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([external/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). diff --git a/lib/asn1/test/testChoOptional.erl b/lib/asn1/test/testChoOptional.erl index 2d969391d0..6e73cba7c2 100644 --- a/lib/asn1/test/testChoOptional.erl +++ b/lib/asn1/test/testChoOptional.erl @@ -24,7 +24,7 @@ -export([optional/1]). %-include("ChoOptional.hrl"). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). diff --git a/lib/asn1/test/testChoOptionalImplicitTag.erl b/lib/asn1/test/testChoOptionalImplicitTag.erl index 30addf2e20..afc8543672 100644 --- a/lib/asn1/test/testChoOptionalImplicitTag.erl +++ b/lib/asn1/test/testChoOptionalImplicitTag.erl @@ -24,7 +24,7 @@ -export([optional/1]). %-include("ChoOptional.hrl"). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). diff --git a/lib/asn1/test/testChoPrim.erl b/lib/asn1/test/testChoPrim.erl index 7fa6164b5a..39970e7a93 100644 --- a/lib/asn1/test/testChoPrim.erl +++ b/lib/asn1/test/testChoPrim.erl @@ -23,7 +23,7 @@ -export([bool/1]). -export([int/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testChoRecursive.erl b/lib/asn1/test/testChoRecursive.erl index f8c5e60f55..5a6388fd64 100644 --- a/lib/asn1/test/testChoRecursive.erl +++ b/lib/asn1/test/testChoRecursive.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([recursive/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('ChoRec_something',{a, b, c}). -record('ChoRec2_something',{a, b, c}). diff --git a/lib/asn1/test/testChoTypeRefCho.erl b/lib/asn1/test/testChoTypeRefCho.erl index 341a77c21b..1f534cc898 100644 --- a/lib/asn1/test/testChoTypeRefCho.erl +++ b/lib/asn1/test/testChoTypeRefCho.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([choice/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testChoTypeRefPrim.erl b/lib/asn1/test/testChoTypeRefPrim.erl index 1ef221819c..1146eaa9f2 100644 --- a/lib/asn1/test/testChoTypeRefPrim.erl +++ b/lib/asn1/test/testChoTypeRefPrim.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([prim/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testChoTypeRefSeq.erl b/lib/asn1/test/testChoTypeRefSeq.erl index 2e9aa7c411..4f3735ec70 100644 --- a/lib/asn1/test/testChoTypeRefSeq.erl +++ b/lib/asn1/test/testChoTypeRefSeq.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([seq/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('ChoSeq',{seqInt, seqOs}). -record('ChoSeqImp',{seqInt, seqOs}). diff --git a/lib/asn1/test/testChoTypeRefSet.erl b/lib/asn1/test/testChoTypeRefSet.erl index e4db73c1e3..c85085bb03 100644 --- a/lib/asn1/test/testChoTypeRefSet.erl +++ b/lib/asn1/test/testChoTypeRefSet.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([set/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('ChoSet',{setInt, setOs}). -record('ChoSetImp',{setInt, setOs}). diff --git a/lib/asn1/test/testChoiceIndefinite.erl b/lib/asn1/test/testChoiceIndefinite.erl index 5eff4ce5d4..af2206ba4e 100644 --- a/lib/asn1/test/testChoiceIndefinite.erl +++ b/lib/asn1/test/testChoiceIndefinite.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testCompactBitString.erl b/lib/asn1/test/testCompactBitString.erl index 12aae260ea..b1d00f4d64 100644 --- a/lib/asn1/test/testCompactBitString.erl +++ b/lib/asn1/test/testCompactBitString.erl @@ -23,7 +23,7 @@ -export([compact_bit_string/1, bit_string_unnamed/1,otp_4869/1, ticket_7734/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Option) -> diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl index f70089fe82..b8075416dd 100644 --- a/lib/asn1/test/testConstraints.erl +++ b/lib/asn1/test/testConstraints.erl @@ -23,7 +23,7 @@ -export([int_constraints/1,refed_NNL_name/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl index ef14397d1e..2160122dfe 100644 --- a/lib/asn1/test/testContextSwitchingTypes.erl +++ b/lib/asn1/test/testContextSwitchingTypes.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([test/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testDER.erl b/lib/asn1/test/testDER.erl index 970e8dadd4..47109798e1 100644 --- a/lib/asn1/test/testDER.erl +++ b/lib/asn1/test/testDER.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([test/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rule,Options) -> diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl index a185a127e5..1f8d0ee637 100644 --- a/lib/asn1/test/testDeepTConstr.erl +++ b/lib/asn1/test/testDeepTConstr.erl @@ -23,7 +23,7 @@ -export([compile/3,main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testDef.erl b/lib/asn1/test/testDef.erl index aa41f7b678..86e6dfc1a2 100644 --- a/lib/asn1/test/testDef.erl +++ b/lib/asn1/test/testDef.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Def1',{bool0, bool1 = asn1_DEFAULT, diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl index 444b06995f..d2e91a12bf 100644 --- a/lib/asn1/test/testDoubleEllipses.erl +++ b/lib/asn1/test/testDoubleEllipses.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Seq',{a, c}). -record('SeqV2',{a, b ,c}). diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl index 7e25aa9b4e..ce909b2b3b 100644 --- a/lib/asn1/test/testEnumExt.erl +++ b/lib/asn1/test/testEnumExt.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testExternal.erl b/lib/asn1/test/testExternal.erl index 3c3dc2ea29..754bc7e232 100644 --- a/lib/asn1/test/testExternal.erl +++ b/lib/asn1/test/testExternal.erl @@ -21,7 +21,7 @@ -export([compile/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl index 2a3a5c333b..0e2a704934 100644 --- a/lib/asn1/test/testINSTANCE_OF.erl +++ b/lib/asn1/test/testINSTANCE_OF.erl @@ -21,7 +21,7 @@ -export([compile/3,main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Opt) -> diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl index 317cd75e4b..4ab3d69e79 100644 --- a/lib/asn1/test/testInfObj.erl +++ b/lib/asn1/test/testInfObj.erl @@ -22,7 +22,7 @@ -export([compile/3,main/1,compile_RANAPfiles/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('InitiatingMessage',{procedureCode,criticality,value}). -record('InitiatingMessage2',{procedureCode,criticality,value}). diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl index 63b332ad0a..08c0ad7580 100644 --- a/lib/asn1/test/testInfObjectClass.erl +++ b/lib/asn1/test/testInfObjectClass.erl @@ -23,7 +23,7 @@ -export([compile/3,main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testMegaco.erl b/lib/asn1/test/testMegaco.erl index 8c0565eec7..094e2d9e5c 100644 --- a/lib/asn1/test/testMegaco.erl +++ b/lib/asn1/test/testMegaco.erl @@ -22,7 +22,7 @@ -export([compile/3,main/2,msg11/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -define(MID, {ip4Address, #'IP4Address'{address = [124, 124, 124, 222], portNumber = 55555}}). -define(A4444, ["11111111"]). diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl index e70ca16b77..3a5d1b876b 100644 --- a/lib/asn1/test/testMergeCompile.erl +++ b/lib/asn1/test/testMergeCompile.erl @@ -22,7 +22,7 @@ -export([compile/3,main/1,mvrasn/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('InitiatingMessage',{procedureCode,criticality,value}). -record('Iu-ReleaseCommand',{protocolIEs,protocolExtensions}). diff --git a/lib/asn1/test/testMvrasn6.erl b/lib/asn1/test/testMvrasn6.erl index 65668f3ed4..ea7633d583 100644 --- a/lib/asn1/test/testMvrasn6.erl +++ b/lib/asn1/test/testMvrasn6.erl @@ -22,7 +22,7 @@ -export([compile/2]). -export([main/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules) -> diff --git a/lib/asn1/test/testNBAPsystem.erl b/lib/asn1/test/testNBAPsystem.erl index 402f16ab5d..66f64162eb 100644 --- a/lib/asn1/test/testNBAPsystem.erl +++ b/lib/asn1/test/testNBAPsystem.erl @@ -21,7 +21,7 @@ -export([compile/3,test/2,cell_setup_req_msg/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('InitiatingMessage',{ procedureID, criticality, messageDiscriminator, transactionID, value}). diff --git a/lib/asn1/test/testOpenTypeImplicitTag.erl b/lib/asn1/test/testOpenTypeImplicitTag.erl index 4300509e07..039c345966 100644 --- a/lib/asn1/test/testOpenTypeImplicitTag.erl +++ b/lib/asn1/test/testOpenTypeImplicitTag.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testOpt.erl b/lib/asn1/test/testOpt.erl index 2967595fd2..50e9acbac9 100644 --- a/lib/asn1/test/testOpt.erl +++ b/lib/asn1/test/testOpt.erl @@ -22,7 +22,7 @@ -export([compile/2]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Opt1',{bool0, bool1 = asn1_NOVALUE, diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl index 172a2881cd..e49f234bac 100644 --- a/lib/asn1/test/testParamBasic.erl +++ b/lib/asn1/test/testParamBasic.erl @@ -23,7 +23,7 @@ -export([compile_der/2]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('T11',{number, string=asn1_DEFAULT}). -record('T12',{number, string=asn1_DEFAULT}). diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl index 91d160f335..b95d627d58 100644 --- a/lib/asn1/test/testParameterizedInfObj.erl +++ b/lib/asn1/test/testParameterizedInfObj.erl @@ -22,7 +22,7 @@ -export([compile/3,main/1,ranap/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('AllocationOrRetentionPriority',{priorityLevel,iE_Extensions}). -record('ProtocolExtensionField',{id,criticality,extensionValue}). diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl index 4ccdd82c13..126cabc292 100644 --- a/lib/asn1/test/testPrim.erl +++ b/lib/asn1/test/testPrim.erl @@ -28,7 +28,7 @@ -export([null/1]). -export([real/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testPrimExternal.erl b/lib/asn1/test/testPrimExternal.erl index 2a6384009a..549e2d61c2 100644 --- a/lib/asn1/test/testPrimExternal.erl +++ b/lib/asn1/test/testPrimExternal.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([external/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl index 707ee375c1..2ab4f0817f 100644 --- a/lib/asn1/test/testPrimStrings.erl +++ b/lib/asn1/test/testPrimStrings.erl @@ -31,7 +31,7 @@ -export([times/1]). -export([utf8_string/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Option) -> diff --git a/lib/asn1/test/testRANAP.erl b/lib/asn1/test/testRANAP.erl index 7c35674d3a..52a58d850b 100644 --- a/lib/asn1/test/testRANAP.erl +++ b/lib/asn1/test/testRANAP.erl @@ -22,7 +22,7 @@ -export([compile/3,testobj/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Erule,Options) -> diff --git a/lib/asn1/test/testROSE.erl b/lib/asn1/test/testROSE.erl index 65851e21fc..46c17d60bb 100644 --- a/lib/asn1/test/testROSE.erl +++ b/lib/asn1/test/testROSE.erl @@ -21,7 +21,7 @@ -export([compile/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testSSLspecs.erl b/lib/asn1/test/testSSLspecs.erl index 87e5e5fd02..4028e1b6fd 100644 --- a/lib/asn1/test/testSSLspecs.erl +++ b/lib/asn1/test/testSSLspecs.erl @@ -22,7 +22,7 @@ -export([compile/3,run/1,compile_inline/2,run_inline/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testSelectionTypes.erl b/lib/asn1/test/testSelectionTypes.erl index a3876c259e..917deb4a16 100644 --- a/lib/asn1/test/testSelectionTypes.erl +++ b/lib/asn1/test/testSelectionTypes.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([test/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rule,Options) -> diff --git a/lib/asn1/test/testSeq2738.erl b/lib/asn1/test/testSeq2738.erl index 0f3c4b7bf7..efdb686924 100644 --- a/lib/asn1/test/testSeq2738.erl +++ b/lib/asn1/test/testSeq2738.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). %-record('SeqOpt',{int, opt = asn1_NOVALUE}). -record('SeqOptFake',{int, opt = asn1_NOVALUE}). diff --git a/lib/asn1/test/testSeqDefault.erl b/lib/asn1/test/testSeqDefault.erl index a626bfd645..13d9b1d759 100644 --- a/lib/asn1/test/testSeqDefault.erl +++ b/lib/asn1/test/testSeqDefault.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqDef1',{bool1 = asn1_DEFAULT, int1, seq1 = asn1_DEFAULT}). -record('SeqDef1Imp',{bool1 = asn1_DEFAULT, int1, seq1 = asn1_DEFAULT}). diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl index 4ddaddb8f1..44d9959048 100644 --- a/lib/asn1/test/testSeqExtension.erl +++ b/lib/asn1/test/testSeqExtension.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqExt1',{}). -record('SeqExt2',{bool, int}). diff --git a/lib/asn1/test/testSeqExternal.erl b/lib/asn1/test/testSeqExternal.erl index f148d32b21..c56e5fe4c0 100644 --- a/lib/asn1/test/testSeqExternal.erl +++ b/lib/asn1/test/testSeqExternal.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqXSet1',{set, bool, int}). diff --git a/lib/asn1/test/testSeqIndefinite.erl b/lib/asn1/test/testSeqIndefinite.erl index b1b622bdfa..a614ba1aa4 100644 --- a/lib/asn1/test/testSeqIndefinite.erl +++ b/lib/asn1/test/testSeqIndefinite.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl index 71556ed746..9007c6192d 100644 --- a/lib/asn1/test/testSeqOf.erl +++ b/lib/asn1/test/testSeqOf.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Seq1',{bool1, int1, seq1 = asn1_DEFAULT}). -record('Seq2',{seq2 = asn1_DEFAULT, bool2, int2}). diff --git a/lib/asn1/test/testSeqOfCho.erl b/lib/asn1/test/testSeqOfCho.erl index eefb258346..a8099a570c 100644 --- a/lib/asn1/test/testSeqOfCho.erl +++ b/lib/asn1/test/testSeqOfCho.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqChoDef',{bool1, int1, seq1 = asn1_DEFAULT}). -record('SeqChoOpt',{bool1, int1, seq1 = asn1_NOVALUE}). diff --git a/lib/asn1/test/testSeqOfExternal.erl b/lib/asn1/test/testSeqOfExternal.erl index dde36e6949..26a929184e 100644 --- a/lib/asn1/test/testSeqOfExternal.erl +++ b/lib/asn1/test/testSeqOfExternal.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('NT',{os, bool}). diff --git a/lib/asn1/test/testSeqOfIndefinite.erl b/lib/asn1/test/testSeqOfIndefinite.erl index 8e8967572a..abee20fb4e 100644 --- a/lib/asn1/test/testSeqOfIndefinite.erl +++ b/lib/asn1/test/testSeqOfIndefinite.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). %-record('Seq1',{bool1, int1, seq1 = asn1_DEFAULT}). %-record('Seq2',{seq2 = asn1_DEFAULT, bool2, int2}). diff --git a/lib/asn1/test/testSeqOfTag.erl b/lib/asn1/test/testSeqOfTag.erl index 0a4e1397a6..fb47bcb32e 100644 --- a/lib/asn1/test/testSeqOfTag.erl +++ b/lib/asn1/test/testSeqOfTag.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). diff --git a/lib/asn1/test/testSeqOptional.erl b/lib/asn1/test/testSeqOptional.erl index 7177011427..3ce647e581 100644 --- a/lib/asn1/test/testSeqOptional.erl +++ b/lib/asn1/test/testSeqOptional.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqOpt1',{bool1 = asn1_NOVALUE, int1, seq1 = asn1_NOVALUE}). -record('SeqOpt1Imp',{bool1 = asn1_NOVALUE, int1, seq1 = asn1_NOVALUE}). diff --git a/lib/asn1/test/testSeqPrim.erl b/lib/asn1/test/testSeqPrim.erl index 7ad1de58a1..4d37585efb 100644 --- a/lib/asn1/test/testSeqPrim.erl +++ b/lib/asn1/test/testSeqPrim.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Seq',{bool, boolCon, boolPri, boolApp, boolExpCon, boolExpPri, boolExpApp}). -record('Empty',{}). diff --git a/lib/asn1/test/testSeqSetDefaultVal.erl b/lib/asn1/test/testSeqSetDefaultVal.erl index 1c238fd1b7..7d03c4cb9b 100644 --- a/lib/asn1/test/testSeqSetDefaultVal.erl +++ b/lib/asn1/test/testSeqSetDefaultVal.erl @@ -23,7 +23,7 @@ -export([compile/2]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqInts',{a = asn1_DEFAULT, b = asn1_DEFAULT, diff --git a/lib/asn1/test/testSeqTag.erl b/lib/asn1/test/testSeqTag.erl index ff6d1bbe91..cb89d46973 100644 --- a/lib/asn1/test/testSeqTag.erl +++ b/lib/asn1/test/testSeqTag.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('SeqTag',{nt, imp, exp}). diff --git a/lib/asn1/test/testSeqTypeRefCho.erl b/lib/asn1/test/testSeqTypeRefCho.erl index 03933d68ae..f8cec62afc 100644 --- a/lib/asn1/test/testSeqTypeRefCho.erl +++ b/lib/asn1/test/testSeqTypeRefCho.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('SeqTRcho',{seqCho, seqChoE, 'seqCho-E', 'seqChoE-E'}). diff --git a/lib/asn1/test/testSeqTypeRefPrim.erl b/lib/asn1/test/testSeqTypeRefPrim.erl index 264fc24f85..ca8d3f64cd 100644 --- a/lib/asn1/test/testSeqTypeRefPrim.erl +++ b/lib/asn1/test/testSeqTypeRefPrim.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqTR',{octStr, octStrI, octStrE, 'octStr-I', 'octStrI-I', 'octStrE-I', 'octStr-E', 'octStrI-E', 'octStrE-E'}). diff --git a/lib/asn1/test/testSeqTypeRefSeq.erl b/lib/asn1/test/testSeqTypeRefSeq.erl index b01c14ee32..368bdf4957 100644 --- a/lib/asn1/test/testSeqTypeRefSeq.erl +++ b/lib/asn1/test/testSeqTypeRefSeq.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Seq1',{bool1, int1, seq1}). -record('Seq2',{seq2, bool2, int2}). diff --git a/lib/asn1/test/testSeqTypeRefSet.erl b/lib/asn1/test/testSeqTypeRefSet.erl index 92d2cadf28..55cf469338 100644 --- a/lib/asn1/test/testSeqTypeRefSet.erl +++ b/lib/asn1/test/testSeqTypeRefSet.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SeqTRset',{seqSet, seqSetI, seqSetE, 'seqSet-I', 'seqSetI-I', 'seqSetE-I', 'seqSet-E', 'seqSetI-E', 'seqSetE-E'}). -record('SeqSet',{setInt, setOs}). diff --git a/lib/asn1/test/testSetDefault.erl b/lib/asn1/test/testSetDefault.erl index e4b6a0ab82..b15b59f5fa 100644 --- a/lib/asn1/test/testSetDefault.erl +++ b/lib/asn1/test/testSetDefault.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetDef1',{bool1 = asn1_DEFAULT, int1, set1 = asn1_DEFAULT}). -record('SetDef2',{set2 = asn1_DEFAULT, bool2, int2}). diff --git a/lib/asn1/test/testSetExtension.erl b/lib/asn1/test/testSetExtension.erl index 85a84e020a..75c64febaa 100644 --- a/lib/asn1/test/testSetExtension.erl +++ b/lib/asn1/test/testSetExtension.erl @@ -24,7 +24,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetExt1',{}). -record('SetExt2',{bool, int}). diff --git a/lib/asn1/test/testSetExternal.erl b/lib/asn1/test/testSetExternal.erl index 83974a5499..d1fb73f812 100644 --- a/lib/asn1/test/testSetExternal.erl +++ b/lib/asn1/test/testSetExternal.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetXSeq1',{seq, bool, int}). diff --git a/lib/asn1/test/testSetIndefinite.erl b/lib/asn1/test/testSetIndefinite.erl index 0e6a86bac4..518ed3bc75 100644 --- a/lib/asn1/test/testSetIndefinite.erl +++ b/lib/asn1/test/testSetIndefinite.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Options) -> diff --git a/lib/asn1/test/testSetOf.erl b/lib/asn1/test/testSetOf.erl index fe68a0705a..ec158b6c5e 100644 --- a/lib/asn1/test/testSetOf.erl +++ b/lib/asn1/test/testSetOf.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Set1',{bool1, int1, set1 = asn1_DEFAULT}). -record('Set2',{set2 = asn1_DEFAULT, bool2, int2}). diff --git a/lib/asn1/test/testSetOfCho.erl b/lib/asn1/test/testSetOfCho.erl index f3164273f6..2468a63d25 100644 --- a/lib/asn1/test/testSetOfCho.erl +++ b/lib/asn1/test/testSetOfCho.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetChoDef',{bool1, int1, set1 = asn1_DEFAULT}). -record('SetChoOpt',{bool1, int1, set1 = asn1_NOVALUE}). diff --git a/lib/asn1/test/testSetOfExternal.erl b/lib/asn1/test/testSetOfExternal.erl index 1c59ad0a74..738ca80445 100644 --- a/lib/asn1/test/testSetOfExternal.erl +++ b/lib/asn1/test/testSetOfExternal.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('NT',{os, bool}). diff --git a/lib/asn1/test/testSetOfTag.erl b/lib/asn1/test/testSetOfTag.erl index ff59a329e3..0600dd2eab 100644 --- a/lib/asn1/test/testSetOfTag.erl +++ b/lib/asn1/test/testSetOfTag.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl index 3df1ed58bb..d70b5011a4 100644 --- a/lib/asn1/test/testSetOptional.erl +++ b/lib/asn1/test/testSetOptional.erl @@ -23,7 +23,7 @@ -export([compile/3]). -export([main/1]). -export([ticket_7533/1,decoder/4]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetOpt1',{bool1 = asn1_NOVALUE, int1, set1 = asn1_NOVALUE}). -record('SetOpt1Imp',{bool1 = asn1_NOVALUE, int1, set1 = asn1_NOVALUE}). diff --git a/lib/asn1/test/testSetPrim.erl b/lib/asn1/test/testSetPrim.erl index cb64011dcc..aa02fca22c 100644 --- a/lib/asn1/test/testSetPrim.erl +++ b/lib/asn1/test/testSetPrim.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Set',{bool, boolCon, boolPri, boolApp, boolExpCon, boolExpPri, boolExpApp}). -record('Empty',{}). diff --git a/lib/asn1/test/testSetTag.erl b/lib/asn1/test/testSetTag.erl index fcf15dc0f0..9f303659c0 100644 --- a/lib/asn1/test/testSetTag.erl +++ b/lib/asn1/test/testSetTag.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('SetTag',{nt, imp, exp}). diff --git a/lib/asn1/test/testSetTypeRefCho.erl b/lib/asn1/test/testSetTypeRefCho.erl index c2dbf076bd..fc7146ac14 100644 --- a/lib/asn1/test/testSetTypeRefCho.erl +++ b/lib/asn1/test/testSetTypeRefCho.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -include("External.hrl"). -record('SetTRcho',{setCho, setChoE, 'setCho-E', 'setChoE-E'}). diff --git a/lib/asn1/test/testSetTypeRefPrim.erl b/lib/asn1/test/testSetTypeRefPrim.erl index 1f95947168..7d4db6e7fc 100644 --- a/lib/asn1/test/testSetTypeRefPrim.erl +++ b/lib/asn1/test/testSetTypeRefPrim.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetTR',{octStr, octStrI, octStrE, 'octStr-I', 'octStrI-I', 'octStrE-I', 'octStr-E', 'octStrI-E', 'octStrE-E'}). diff --git a/lib/asn1/test/testSetTypeRefSeq.erl b/lib/asn1/test/testSetTypeRefSeq.erl index 2f6dfec9c6..465f627d52 100644 --- a/lib/asn1/test/testSetTypeRefSeq.erl +++ b/lib/asn1/test/testSetTypeRefSeq.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('SetTRseq',{setSeq, setSeqI, setSeqE, 'setSeq-I', 'setSeqI-I', 'setSeqE-I', 'setSeq-E', 'setSeqI-E', 'setSeqE-E'}). -record('SetSeq',{seqInt, seqOs}). diff --git a/lib/asn1/test/testSetTypeRefSet.erl b/lib/asn1/test/testSetTypeRefSet.erl index 132e5fb3f5..ee5014da6e 100644 --- a/lib/asn1/test/testSetTypeRefSet.erl +++ b/lib/asn1/test/testSetTypeRefSet.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Set1',{bool1, int1, set1}). -record('Set2',{set2, bool2, int2}). diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl index 3e2c2de371..b33f8022fc 100644 --- a/lib/asn1/test/testTCAP.erl +++ b/lib/asn1/test/testTCAP.erl @@ -21,7 +21,7 @@ -export([compile/3,test/2,compile_asn1config/3,test_asn1config/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testTcapsystem.erl b/lib/asn1/test/testTcapsystem.erl index c48b1b835d..dc650fa019 100644 --- a/lib/asn1/test/testTcapsystem.erl +++ b/lib/asn1/test/testTcapsystem.erl @@ -21,7 +21,7 @@ -export([compile/3]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl index 0fade7ebca..eac294c73c 100644 --- a/lib/asn1/test/testTimer.erl +++ b/lib/asn1/test/testTimer.erl @@ -22,7 +22,7 @@ -compile(export_all). %%-export([Function/Arity, ...]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -define(times, 5000). diff --git a/lib/asn1/test/testTypeValueNotation.erl b/lib/asn1/test/testTypeValueNotation.erl index 0fc3dc3197..27af00075e 100644 --- a/lib/asn1/test/testTypeValueNotation.erl +++ b/lib/asn1/test/testTypeValueNotation.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([main/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -record('Seq',{octstr, int, bool, enum, bitstr, null, oid, vstr}). diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl index 0fa3e6fb13..d36b246dee 100644 --- a/lib/asn1/test/testX420.erl +++ b/lib/asn1/test/testX420.erl @@ -23,7 +23,7 @@ -export([compile/3, ticket7759/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Erule,Options,Config) -> diff --git a/lib/asn1/test/test_bad_values.erl b/lib/asn1/test/test_bad_values.erl index 0190b6ee9a..90e6bd34f5 100644 --- a/lib/asn1/test/test_bad_values.erl +++ b/lib/asn1/test/test_bad_values.erl @@ -20,7 +20,7 @@ -module(test_bad_values). -export([tests/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). tests(Config) -> ?line DataDir = ?config(data_dir,Config), diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl index a6e0caa0f1..040d2b79b2 100644 --- a/lib/asn1/test/test_compile_options.erl +++ b/lib/asn1/test/test_compile_options.erl @@ -20,7 +20,7 @@ -module(test_compile_options). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -export([wrong_path/1,comp/2,path/1,ticket_6143/1,noobj/1, diff --git a/lib/asn1/test/test_driver_load.erl b/lib/asn1/test/test_driver_load.erl index 37a7e36a45..6758665562 100644 --- a/lib/asn1/test/test_driver_load.erl +++ b/lib/asn1/test/test_driver_load.erl @@ -21,7 +21,7 @@ -export([compile/2,test/2,encode/0]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). test(per_bin,0) -> diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl index aac003baf6..503ab658ce 100644 --- a/lib/asn1/test/test_inline.erl +++ b/lib/asn1/test/test_inline.erl @@ -23,7 +23,7 @@ -export([mvrasn_inlined_encdec/2,mvrasn_encdec/2, mi_encdec/2,m_encdec/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -define(times, 5000). -define(times2, 50000). diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl index 93fcd73eaf..7361aa16cd 100644 --- a/lib/asn1/test/test_modified_x420.erl +++ b/lib/asn1/test/test_modified_x420.erl @@ -22,7 +22,7 @@ %-compile(export_all). -export([compile/1, test_io/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config) -> ?line DataDir = ?config(data_dir,Config), diff --git a/lib/asn1/test/test_partial_incomplete_decode.erl b/lib/asn1/test/test_partial_incomplete_decode.erl index 9fd078e952..9c98d3cfc8 100644 --- a/lib/asn1/test/test_partial_incomplete_decode.erl +++ b/lib/asn1/test/test_partial_incomplete_decode.erl @@ -21,7 +21,7 @@ -export([compile/3,test/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). diff --git a/lib/asn1/test/test_selective_decode.erl b/lib/asn1/test/test_selective_decode.erl index 94d3d5f34a..56c9ad4272 100644 --- a/lib/asn1/test/test_selective_decode.erl +++ b/lib/asn1/test/test_selective_decode.erl @@ -21,7 +21,7 @@ -export([test/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). test(ber_bin_v2,_Config) -> diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl index c451d65172..0db710404a 100644 --- a/lib/asn1/test/test_special_decode_performance.erl +++ b/lib/asn1/test/test_special_decode_performance.erl @@ -21,7 +21,7 @@ -export([compile/2,go/1,loop2/4,loop1/5]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rule) when Rule==ber_bin_v2 -> diff --git a/lib/asn1/test/test_undecoded_rest.erl b/lib/asn1/test/test_undecoded_rest.erl index c7762d28f7..0649957a1c 100644 --- a/lib/asn1/test/test_undecoded_rest.erl +++ b/lib/asn1/test/test_undecoded_rest.erl @@ -21,7 +21,7 @@ -export([compile/3,test/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). %% testing OTP-5104 diff --git a/lib/asn1/test/test_x691.erl b/lib/asn1/test/test_x691.erl index 5bf3a4a077..9e8d63cd79 100644 --- a/lib/asn1/test/test_x691.erl +++ b/lib/asn1/test/test_x691.erl @@ -22,7 +22,7 @@ -export([compile/3]). -export([cases/2]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config,Rules,Option) -> |