diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 21:22:21 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 21:22:21 +0000 |
| commit | a7542f344f1f6784071be2fc3e17db7cc0764566 (patch) | |
| tree | bdb6d82abb4fa912a786bbe53e970725fcb83051 /third_party/ffmpeg/generate_stubs_unittest.py | |
| parent | 8d5a34e2b9853514b5fc5cb33be629f452e558eb (diff) | |
| download | chromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.zip chromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.tar.gz chromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.tar.bz2 | |
Revert "Revert r18122: "Reapply ffmpeg changes." (it broke the Linux make build)."
This reverts commit r18168 and reapplies r18122. I.e., this
reapplies the ffmpeg changes.
Review URL: http://codereview.chromium.org/125003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/generate_stubs_unittest.py')
| -rwxr-xr-x | third_party/ffmpeg/generate_stubs_unittest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/ffmpeg/generate_stubs_unittest.py b/third_party/ffmpeg/generate_stubs_unittest.py index ccaa35b..b68175e 100755 --- a/third_party/ffmpeg/generate_stubs_unittest.py +++ b/third_party/ffmpeg/generate_stubs_unittest.py @@ -136,12 +136,15 @@ class WindowsLibCreatorUnittest(unittest.TestCase): self.module_name = 'my_module-1' self.signatures = [sig[1] for sig in SIMPLE_SIGNATURES] self.out_dir = 'out_dir' + self.intermediate_dir = 'intermediate_dir' self.creator = gs.WindowsLibCreator(self.module_name, self.signatures, + self.intermediate_dir, self.out_dir) def testDefFilePath(self): - self.assertEqual('out_dir/my_module-1.def', self.creator.DefFilePath()) + self.assertEqual('intermediate_dir/my_module-1.def', + self.creator.DefFilePath()) def testLibFilePath(self): self.assertEqual('out_dir/my_module-1.lib', self.creator.LibFilePath()) |