summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-05-11 21:09:20 -0600
committerBrian Paul <brianp@vmware.com>2010-05-11 21:09:20 -0600
commit0dc18841f5b9c9bbc40465ddf767fe793b1b198d (patch)
tree20768cb2fe60e0de2acc35f3ced163255d8d3f5c /progs
parent42d31bf39095c8377a107510b90b3fea5fb3cc76 (diff)
progs/tests: update getprocaddress test since moving glapi files
Diffstat (limited to 'progs')
-rw-r--r--progs/tests/Makefile5
-rw-r--r--progs/tests/getprocaddress.py6
2 files changed, 8 insertions, 3 deletions
diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 0f938f9b0c..f8473e64e2 100644
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -134,6 +134,9 @@ INCLUDES = -I. -I$(TOP)/include
UTIL_FILES = readtex.h readtex.c
+GL_API_XML = $(TOP)/src/mapi/glapi/gen/gl_API.xml
+
+
##### TARGETS #####
default: $(UTIL_FILES) $(PROGS)
@@ -160,7 +163,7 @@ clean:
# auto code generation
getprocaddress: getprocaddress.c getproclist.h
-getproclist.h: $(TOP)/src/mesa/glapi/gen/gl_API.xml getprocaddress.c getprocaddress.py
+getproclist.h: $(GL_API_XML) getprocaddress.c getprocaddress.py
python getprocaddress.py > getproclist.h
arraytexture: arraytexture.o readtex.o
diff --git a/progs/tests/getprocaddress.py b/progs/tests/getprocaddress.py
index 60111cb801..c421f90cb6 100644
--- a/progs/tests/getprocaddress.py
+++ b/progs/tests/getprocaddress.py
@@ -3,8 +3,10 @@
# Helper for the getprocaddress.c test.
+glapi_xml_path = "../../src/mapi/glapi/gen/"
+
import sys, getopt, re
-sys.path.append("../../src/mesa/glapi/gen" )
+sys.path.append(glapi_xml_path)
import gl_XML
import license
@@ -74,7 +76,7 @@ static struct name_test_pair functions[] = {"""
if __name__ == '__main__':
- file_name = "../../src/mesa/glapi/gen/gl_API.xml"
+ file_name = glapi_xml_path + "gl_API.xml"
try:
(args, trail) = getopt.getopt(sys.argv[1:], "f:")