Mesa (master): progs/tests: update getprocaddress test since moving glapi files

Brian Paul brianp at kemper.freedesktop.org
Wed May 12 03:44:46 UTC 2010


Module: Mesa
Branch: master
Commit: 0dc18841f5b9c9bbc40465ddf767fe793b1b198d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0dc18841f5b9c9bbc40465ddf767fe793b1b198d

Author: Brian Paul <brianp at vmware.com>
Date:   Tue May 11 21:09:20 2010 -0600

progs/tests: update getprocaddress test since moving glapi files

---

 progs/tests/Makefile          |    5 ++++-
 progs/tests/getprocaddress.py |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 0f938f9..f8473e6 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 60111cb..c421f90 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:")




More information about the mesa-commit mailing list