Author: rhuijben
Date: Tue Sep 8 13:00:35 2015
New Revision: 1701799
URL: http://svn.apache.org/r1701799
Log:
On the 1.3.x branch: Merge r1699858 and set svn:eol-style on SConstruct.
This should fix VPath builds.
* .
* SConstruct
* build/check.py
Apply VPATH fix.
Modified:
serf/branches/1.3.x/ (props changed)
serf/branches/1.3.x/SConstruct (contents, props changed)
serf/branches/1.3.x/build/check.py
Propchange: serf/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 8 13:00:35 2015
@@ -1,4 +1,4 @@
/serf/branches/1.3.x:1699925,1699931
/serf/branches/multiple_ssl_impls:1699382
/serf/branches/windows-sspi:1698866-1698877
-/serf/trunk:1699516-1699518,1699520-1699522,1699528,1699530-1699535,1699537,1699539-1699541,1699543,1699548-1699549,1699553,1699555-1699556,1699559-1699560,1699563-1699565,1699567-1699570,1699572-1699573,1699578-1699580,1699582-1699597,1699599-1699602,1699607,1699610,1699615-1699618,1699622-1699623,1699626-1699627,1699633,1699637,1699642,1699645,1699647,1699649-1699650,1699652,1699654-1699655,1699659-1699665,1699671,1699674,1699680-1699683,1699687-1699688,1699690,1699692-1699694,1699698-1699700,1699702,1699707-1699708,1699712-1699716,1699720,1699724,1699728,1699730,1699733,1699762,1699770,1699773,1699777,1699780-1699781,1699798,1699800-1699801,1699817,1699819,1699838,1699843,1699846,1699850,1699873,1699881,1699884,1699902-1699903,1699906,1699924,1699926-1699927,1699930,1699932,1699936-1699937,1699941,1699948-1699950,1699954,1699957,1699964,1699973,1699975,1700234,1700236
+/serf/trunk:1699516-1699518,1699520-1699522,1699528,1699530-1699535,1699537,1699539-1699541,1699543,1699548-1699549,1699553,1699555-1699556,1699559-1699560,1699563-1699565,1699567-1699570,1699572-1699573,1699578-1699580,1699582-1699597,1699599-1699602,1699607,1699610,1699615-1699618,1699622-1699623,1699626-1699627,1699633,1699637,1699642,1699645,1699647,1699649-1699650,1699652,1699654-1699655,1699659-1699665,1699671,1699674,1699680-1699683,1699687-1699688,1699690,1699692-1699694,1699698-1699700,1699702,1699707-1699708,1699712-1699716,1699720,1699724,1699728,1699730,1699733,1699762,1699770,1699773,1699777,1699780-1699781,1699798,1699800-1699801,1699817,1699819,1699838,1699843,1699846,1699850,1699858,1699873,1699881,1699884,1699902-1699903,1699906,1699924,1699926-1699927,1699930,1699932,1699936-1699937,1699941,1699948-1699950,1699954,1699957,1699964,1699973,1699975,1700234,1700236
Modified: serf/branches/1.3.x/SConstruct
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/SConstruct?rev=1701799&r1=1701798&r2=1701799&view=diff
==============================================================================
--- serf/branches/1.3.x/SConstruct (original)
+++ serf/branches/1.3.x/SConstruct Tue Sep 8 13:00:35 2015
@@ -437,8 +437,13 @@ if sys.platform == 'win32':
else:
TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
-env.AlwaysBuild(env.Alias('check', TEST_EXES, sys.executable + '
build/check.py',
- ENV={'PATH' : os.environ['PATH']}))
+check_script = env.File('build/check.py').rstr()
+test_dir = env.File('test/test_all.c').rfile().get_dir()
+src_dir = env.File('serf.h').rfile().get_dir()
+test_app = ("%s %s %s %s") % (sys.executable, check_script, test_dir, 'test')
+env.AlwaysBuild(env.Alias('check', TEST_EXES, test_app,
+ ENV={'PATH' : os.environ['PATH'],
+ 'srcdir' : src_dir}))
# Find the (dynamic) library in this directory
tenv.Replace(RPATH=thisdir)
Propchange: serf/branches/1.3.x/SConstruct
------------------------------------------------------------------------------
svn:eol-style = native
Modified: serf/branches/1.3.x/build/check.py
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/build/check.py?rev=1701799&r1=1701798&r2=1701799&view=diff
==============================================================================
--- serf/branches/1.3.x/build/check.py (original)
+++ serf/branches/1.3.x/build/check.py Tue Sep 8 13:00:35 2015
@@ -31,6 +31,11 @@ if __name__ == '__main__':
else:
testdir = 'test'
+ if len(sys.argv) > 2:
+ test_builddir = sys.argv[2]
+ else:
+ test_builddir = 'test'
+
# define test executable paths
if sys.platform == 'win32':
SERF_RESPONSE_EXE = 'serf_response.exe'
@@ -38,8 +43,8 @@ if __name__ == '__main__':
else:
SERF_RESPONSE_EXE = 'serf_response'
TEST_ALL_EXE = 'test_all'
- SERF_RESPONSE_EXE = os.path.join(testdir, SERF_RESPONSE_EXE)
- TEST_ALL_EXE = os.path.join(testdir, TEST_ALL_EXE)
+ SERF_RESPONSE_EXE = os.path.join(test_builddir, SERF_RESPONSE_EXE)
+ TEST_ALL_EXE = os.path.join(test_builddir, TEST_ALL_EXE)
# Find test responses and run them one by one
for case in glob.glob(testdir + "/testcases/*.response"):
