aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2010-01-15 17:01:59 +0000
committerErlang/OTP <[email protected]>2010-01-15 17:01:59 +0000
commitb11ae687581f3c55dc2dea3c8ced5931b5ecaed1 (patch)
tree2426cc6760fe86a758e0363071a74670bbc9564d
parente9adb6d0ef8426dec1f8f3211cabb49fc4464c01 (diff)
downloadotp-b11ae687581f3c55dc2dea3c8ced5931b5ecaed1.tar.gz
otp-b11ae687581f3c55dc2dea3c8ced5931b5ecaed1.tar.bz2
otp-b11ae687581f3c55dc2dea3c8ced5931b5ecaed1.zip
OTP-8016, OTP-8056, OTP-8103, OTP-8106, OTP-8312, OTP-8315, OTP-8327, OTP-8349,
OTP-8351, OTP-8359 & OTP-8371.
-rw-r--r--lib/inets/test/ftp_SUITE_data/TAR.exclude2
-rw-r--r--lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel23
-rw-r--r--lib/inets/vsn.mk2
3 files changed, 13 insertions, 14 deletions
diff --git a/lib/inets/test/ftp_SUITE_data/TAR.exclude b/lib/inets/test/ftp_SUITE_data/TAR.exclude
deleted file mode 100644
index 2078965740..0000000000
--- a/lib/inets/test/ftp_SUITE_data/TAR.exclude
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp_SUITE_data/TAR.exclude
-ftp_SUITE_data/ftpd_hosts
diff --git a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel b/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel
index a820f8d014..75096ce687 100644
--- a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel
+++ b/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel
@@ -1,17 +1,18 @@
%% Add a host name in the appropriate list
%% Each "platform" contains a list of hostnames (a string) that can
%% be used for testing the ftp client.
-[{solaris8_sparc, []},
- {solaris9_sparc, []},
- {solaris10_sparc, []},
- {solaris10_x86, []},
- {linux_x86, []},
- {linux_ppc, []},
- {macosx_ppc, []},
- {macosx_x86, []},
+%% The definition below are an example!!
+[{solaris8_sparc, ["solaris8_sparc_dummy1", "solaris8_sparc_dummy2"]},
+ {solaris9_sparc, ["solaris9_sparc_dummy1"]},
+ {solaris10_sparc, ["solaris10_sparc_dummy1"]},
+ {solaris10_x86, ["solaris10_x86_dummy1", "solaris10_x86_dummy2"]},
+ {linux_x86, ["linux_x86_dummy1", "linux_x86_dummy2"]},
+ {linux_ppc, ["linux_ppc_dummy1"]},
+ {macosx_ppc, ["macosx_ppc_dummy1"]},
+ {macosx_x86, ["macosx_x86_dummy1", "macosx_x86_dummy2"]},
{openbsd_x86, []},
- {freebsd_x86, []},
+ {freebsd_x86, ["freebsd_x86_dummy1"]},
{netbsd_x86, []},
{windows_xp, []},
- {windows_2003_server, []},
- {ticket_test, []}].
+ {windows_2003_server, ["win2003_dummy1"]},
+ {ticket_test, ["solaris8_x86_dummy1", "linux_x86_dummy1"]}].
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 34c18c4d13..433724f190 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,7 +19,7 @@
APPLICATION = inets
INETS_VSN = 5.3
-PRE_VSN =-p10
+PRE_VSN =-p12
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
TICKETS = \