diff options
Diffstat (limited to 'test/subdirectory')
-rw-r--r-- | test/subdirectory/gyptest-SYMROOT-all.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-SYMROOT-default.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-subdir-all.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-subdir-default.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-subdir2-deep.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-top-all.py | 2 | ||||
-rw-r--r-- | test/subdirectory/gyptest-top-default.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/test/subdirectory/gyptest-SYMROOT-all.py b/test/subdirectory/gyptest-SYMROOT-all.py index 3b7ce014..3194220e 100644 --- a/test/subdirectory/gyptest-SYMROOT-all.py +++ b/test/subdirectory/gyptest-SYMROOT-all.py @@ -20,7 +20,7 @@ test.run_gyp('prog1.gyp', '-Dset_symroot=1', '--depth=.', chdir='src') test.relocate('src', 'relocate/src') # Suppress the test infrastructure's setting SYMROOT on the command line. -test.build_all('prog1.gyp', SYMROOT=None, chdir='relocate/src') +test.build('prog1.gyp', test.ALL, SYMROOT=None, chdir='relocate/src') test.run_built_executable('prog1', stdout="Hello from prog1.c\n", diff --git a/test/subdirectory/gyptest-SYMROOT-default.py b/test/subdirectory/gyptest-SYMROOT-default.py index ed070c0f..453c5a16 100644 --- a/test/subdirectory/gyptest-SYMROOT-default.py +++ b/test/subdirectory/gyptest-SYMROOT-default.py @@ -20,7 +20,7 @@ test.run_gyp('prog1.gyp', '-Dset_symroot=1', '--depth=.', chdir='src') test.relocate('src', 'relocate/src') # Suppress the test infrastructure's setting SYMROOT on the command line. -test.build_default('prog1.gyp', SYMROOT=None, chdir='relocate/src') +test.build('prog1.gyp', SYMROOT=None, chdir='relocate/src') test.run_built_executable('prog1', stdout="Hello from prog1.c\n", diff --git a/test/subdirectory/gyptest-subdir-all.py b/test/subdirectory/gyptest-subdir-all.py index 7459d220..8e62ae62 100644 --- a/test/subdirectory/gyptest-subdir-all.py +++ b/test/subdirectory/gyptest-subdir-all.py @@ -14,7 +14,7 @@ test.run_gyp('prog1.gyp', chdir='src') test.relocate('src', 'relocate/src') -test.build_all('prog2.gyp', chdir='relocate/src/subdir') +test.build('prog2.gyp', test.ALL, chdir='relocate/src/subdir') test.must_not_exist('relocate/src/prog1'+test._exe) diff --git a/test/subdirectory/gyptest-subdir-default.py b/test/subdirectory/gyptest-subdir-default.py index f016b6f3..9f1556e6 100644 --- a/test/subdirectory/gyptest-subdir-default.py +++ b/test/subdirectory/gyptest-subdir-default.py @@ -14,7 +14,7 @@ test.run_gyp('prog1.gyp', chdir='src') test.relocate('src', 'relocate/src') -test.build_default('prog2.gyp', chdir='relocate/src/subdir') +test.build('prog2.gyp', chdir='relocate/src/subdir') test.must_not_exist('relocate/src/prog1'+test._exe) diff --git a/test/subdirectory/gyptest-subdir2-deep.py b/test/subdirectory/gyptest-subdir2-deep.py index 719e5174..9c738db8 100644 --- a/test/subdirectory/gyptest-subdir2-deep.py +++ b/test/subdirectory/gyptest-subdir2-deep.py @@ -12,7 +12,7 @@ test.run_gyp('prog3.gyp', chdir='src/subdir/subdir2') test.relocate('src', 'relocate/src') -test.build_all('prog3.gyp', chdir='relocate/src/subdir/subdir2') +test.build('prog3.gyp', test.ALL, chdir='relocate/src/subdir/subdir2') test.run_built_executable('prog3', chdir='relocate/src/subdir/subdir2', diff --git a/test/subdirectory/gyptest-top-all.py b/test/subdirectory/gyptest-top-all.py index 446996d3..4bab1e49 100644 --- a/test/subdirectory/gyptest-top-all.py +++ b/test/subdirectory/gyptest-top-all.py @@ -22,7 +22,7 @@ test.run_gyp('prog1.gyp', chdir='src') test.relocate('src', 'relocate/src') -test.build_all('prog1.gyp', chdir='relocate/src') +test.build('prog1.gyp', test.ALL, chdir='relocate/src') test.run_built_executable('prog1', stdout="Hello from prog1.c\n", diff --git a/test/subdirectory/gyptest-top-default.py b/test/subdirectory/gyptest-top-default.py index b8e33d29..170537ed 100644 --- a/test/subdirectory/gyptest-top-default.py +++ b/test/subdirectory/gyptest-top-default.py @@ -22,7 +22,7 @@ test.run_gyp('prog1.gyp', chdir='src') test.relocate('src', 'relocate/src') -test.build_default('prog1.gyp', chdir='relocate/src') +test.build('prog1.gyp', chdir='relocate/src') test.run_built_executable('prog1', stdout="Hello from prog1.c\n", |