Skip to content

Commit

Permalink
Teach port suite to not use unix-specific commands and not leave them…
Browse files Browse the repository at this point in the history
… running
  • Loading branch information
bufflig committed Sep 13, 2010
1 parent 2f2d4c6 commit ac804e8
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 4 deletions.
10 changes: 7 additions & 3 deletions erts/emulator/test/port_SUITE.erl
Expand Up @@ -2305,7 +2305,11 @@ load_driver(Dir, Driver) ->
close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."];
close_deaf_port(suite) -> [];
close_deaf_port(Config) when is_list(Config) ->
Port = open_port({spawn,"sleep 999999"},[]),
erlang:port_command(Port,"Hello, can you hear me!?!?"),
port_close(Port),
?line Dog = test_server:timetrap(test_server:seconds(100)),
?line DataDir = ?config(data_dir, Config),
?line DeadPort = os:find_executable("dead_port", DataDir),

?line Port = open_port({spawn,DeadPort++" 60"},[]),
?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
?line port_close(Port),
ok.
2 changes: 1 addition & 1 deletion erts/emulator/test/port_SUITE_data/Makefile.src
Expand Up @@ -3,7 +3,7 @@ LD = @LD@
CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
CROSSLDFLAGS = @CROSSLDFLAGS@

PROGS = port_test@exe@ echo_args@exe@
PROGS = port_test@exe@ echo_args@exe@ dead_port@exe@
DRIVERS = echo_drv@dll@ exit_drv@dll@ failure_drv@dll@

all: $(PROGS) $(DRIVERS) port_test.@EMULATOR@
Expand Down
102 changes: 102 additions & 0 deletions erts/emulator/test/port_SUITE_data/dead_port.c
@@ -0,0 +1,102 @@
/*
* %CopyrightBegin%
*
* Copyright Ericsson AB 2001-2010. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
* compliance with the License. You should have received a copy of the
* Erlang Public License along with this software. If not, it can be
* retrieved online at http://www.erlang.org/.
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
* the License for the specific language governing rights and limitations
* under the License.
*
* %CopyrightEnd%
*/

#ifdef VXWORKS
#include <vxWorks.h>
#include <taskVarLib.h>
#include <taskLib.h>
#include <sysLib.h>
#include <string.h>
#include <ioLib.h>
#endif

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>

#ifndef __WIN32__
#include <unistd.h>

#ifdef VXWORKS
#include "reclaim.h"
#include <sys/times.h>
#else
#include <sys/time.h>
#endif

#define O_BINARY 0
#define _setmode(fd, mode)
#endif

#ifdef __WIN32__
#include "windows.h"
#include "winbase.h"
#endif


#ifdef VXWORKS
#define MAIN(argc, argv) port_test(argc, argv)
#else
#define MAIN(argc, argv) main(argc, argv)
#endif


extern int errno;

static void delay(unsigned ms);


MAIN(argc, argv)
int argc;
char *argv[];
{
int x;
if (argc < 2) {
fprintf(stderr,"Usage %s <seconds>\n",argv[0]);
return 1;
}
if ((x = atoi(argv[1])) <= 0) {
fprintf(stderr,"Usage %s <seconds>\n",argv[0]);
return 1;
}
delay(x*1000);
return 0;
}

static void
delay(unsigned ms)
{
#ifdef VXWORKS
taskDelay((sysClkRateGet() * ms) / 1000);
#else
#ifdef __WIN32__
Sleep(ms);
#else
struct timeval t;
t.tv_sec = ms/1000;
t.tv_usec = (ms % 1000) * 1000;

select(0, NULL, NULL, NULL, &t);
#endif
#endif
}

0 comments on commit ac804e8

Please sign in to comment.