aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/Makefile
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-04-20 10:54:07 +0200
committerLukas Larsson <[email protected]>2011-04-20 10:55:44 +0200
commit0cc207fdd1e0cea65c45256dea110caf9be95d01 (patch)
tree3cbd6c54476b44ed9648c810692c60be476ed59a /erts/test/Makefile
parent23906a01725f4494b8816c242926d08aeca0ef67 (diff)
parenta34016f35625c77f4487b649f8234b0af3b1bb3b (diff)
downloadotp-0cc207fdd1e0cea65c45256dea110caf9be95d01.tar.gz
otp-0cc207fdd1e0cea65c45256dea110caf9be95d01.tar.bz2
otp-0cc207fdd1e0cea65c45256dea110caf9be95d01.zip
Merge branch 'maint-r14' into dev
* maint-r14: Prepare release Update framwork backwards compatability check to use TEST_SERVER_FRAMEWORK as it should and not the Module Export ct_framework:end_tc/3 for backwards compatability reasons Update end_tc framework calls to check the name of the framework module instead of the return value of the call
Diffstat (limited to 'erts/test/Makefile')
0 files changed, 0 insertions, 0 deletions