From f64e1905798a70bdd44b4ce21d800a2bc542cee9 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 30 Sep 2010 20:03:24 +0100
Subject: [PATCH] usd: Make test program build again

Make the USD test program build again. Note that this isn't much use
unless you have a tape device connected to your machine.

Change-Id: I01bae4035ef3db966d9f79fb5796e3608efa2cfd
Reviewed-on: http://gerrit.openafs.org/4767
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/usd/test/.gitignore  | 1 +
 src/usd/test/Makefile.in | 5 ++---
 src/usd/test/usd_test.c  | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 src/usd/test/.gitignore

diff --git a/src/usd/test/.gitignore b/src/usd/test/.gitignore
new file mode 100644
index 0000000..29bf530
--- /dev/null
+++ b/src/usd/test/.gitignore
@@ -0,0 +1 @@
+/usd_test
diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in
index bc8cd9c..b57082d 100644
--- a/src/usd/test/Makefile.in
+++ b/src/usd/test/Makefile.in
@@ -12,12 +12,11 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp
 
 
 INCDIRS= -I${DESTDIR}/include  -I..
-CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS}
-LIBUSD=DEST/lib/afs/libusd.a
+LIBUSD=${TOP_LIBDIR}/libusd.a
 
 #####################################################################
 # include files
-INCLS=${SRCDIR}/include/afs/param.h ${SRCDIR}/include/afs/usd.h
+INCLS=${TOP_INCDIR}/afs/param.h ${TOP_INCDIR}/afs/usd.h
 
 
 # build usd_test
diff --git a/src/usd/test/usd_test.c b/src/usd/test/usd_test.c
index f388a44..ccf3560 100644
--- a/src/usd/test/usd_test.c
+++ b/src/usd/test/usd_test.c
@@ -7,7 +7,7 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-* /
+
 /* usd_test.c: Tests the usd library by opening a tape device,
  *         writing a few blocks of data to it, doing a fsf, bsf
  */
@@ -15,6 +15,8 @@
 #include <afs/param.h>
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include <afs/usd.h>
 #ifdef AFS_NT40_ENV
 #include <windows.h>
@@ -149,6 +151,8 @@ main(int argc, char **argv)
 	return 1;
     }
     printf("%s: usd library, all tests passed!\n", whoami);
+
+    return 0;
 }
 
 
-- 
1.9.4