diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-04-03 18:07:33 -0400 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-04-03 18:07:33 -0400 |
| commit | 6b6c8c6b7f60bfc7edb37801d0f92c45568a15fc (patch) | |
| tree | e03c45aa2b9f53553a6a34dde1e041a2b4d25cc4 /tests/runner.py | |
| parent | 23b742cea50f3224a73a0446c0eac228100f75af (diff) | |
| parent | e419c0a9bb69da5d553ab1aa535ff6d3e4e3e0b9 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into gl_small_fixes
Conflicts:
src/library_gl.js
Diffstat (limited to 'tests/runner.py')
| -rwxr-xr-x | tests/runner.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index 93c50b20..c340d3a5 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -6878,8 +6878,9 @@ elif 'browser' in str(sys.argv): def test_glbook(self): programs = self.get_library('glbook', [ - os.path.join('Chapter_2/Hello_Triangle/CH02_HelloTriangle.bc'), - os.path.join('Chapter_8/Simple_VertexShader/CH08_SimpleVertexShader.bc') + os.path.join('Chapter_2', 'Hello_Triangle', 'CH02_HelloTriangle.bc'), + os.path.join('Chapter_8', 'Simple_VertexShader', 'CH08_SimpleVertexShader.bc'), + os.path.join('Chapter_9/Simple_Texture2D/CH09_SimpleTexture2D.bc'), ], configure=None) for program in programs: print program |