summaryrefslogtreecommitdiff
path: root/regress/lib/libpthread
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-09-18 01:59:59 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-09-18 01:59:59 +0000
commit701c35a9b7b3371dae12746f0c65da8307fcad2d (patch)
tree4559385cb4ca00607163a214a4fd4789cf80b8b9 /regress/lib/libpthread
parent65d1cfd9095e2d6a5368e21e7e52945670e03ef1 (diff)
from marc:
brad@ reported that the libpthread execve regression test failed on alpha and macppc. The test was somewhat bogus and depended upon the compiler picking the global when a global and local were named the same. Anyway, this patch should fix it. Tested on Henning's alpha (bet he forgot he gave me an account :-), i386, and sparc64.
Diffstat (limited to 'regress/lib/libpthread')
-rw-r--r--regress/lib/libpthread/execve/execve.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/lib/libpthread/execve/execve.c b/regress/lib/libpthread/execve/execve.c
index fa94f2a9e9f..7e6905c5628 100644
--- a/regress/lib/libpthread/execve/execve.c
+++ b/regress/lib/libpthread/execve/execve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: execve.c,v 1.3 2003/07/31 21:48:04 deraadt Exp $ */
+/* $OpenBSD: execve.c,v 1.4 2003/09/18 01:59:58 henning Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996 by Chris Provenzano and contributors,
* proven@mit.edu All rights reserved.
@@ -46,7 +46,7 @@
#include "test.h"
extern char **environ;
-char *argv[] = {
+char *new_argv[] = {
"/bin/echo",
"This line should appear after the execve",
NULL
@@ -77,6 +77,6 @@ main(int argc, char *argv[])
CHECKe(dup2(fd, STDOUT_FILENO));
CHECKe(write(STDOUT_FILENO, should_succeed,
(size_t)strlen(should_succeed)));
- CHECKe(execve(argv[0], argv, environ));
- DIE(errno, "execve %s", argv[0]);
+ CHECKe(execve(new_argv[0], new_argv, environ));
+ DIE(errno, "execve %s", new_argv[0]);
}