Skip to content

Commit

Permalink
Merge pull request #23 from LewisLabUCSD/develop
Browse files Browse the repository at this point in the history
Regular merge of develop
  • Loading branch information
laurentheirendt authored Jun 18, 2019
2 parents 4e2704a + a28ae0c commit 5c95905
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion test/base/getEnvironment.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
% environment: a struct with two fields
% * .globals - contains all global values
% * .path - contains the current path
%
% NOTE:
% this function has been uploaded from
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/getEnvironment.m
Expand Down
1 change: 0 additions & 1 deletion test/base/getFilesInDir.m
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/install/getFilesInDir.m
% [cdb2478]


persistent COBRAIgnored

if isempty(COBRAIgnored)
Expand Down
1 change: 0 additions & 1 deletion test/base/getGlobalValue.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/getGlobalValue.m
% [e6b4efd]


eval(['global ' globalName]);
eval(['value = ' globalName ';']);
end
3 changes: 0 additions & 3 deletions test/base/getIgnoredFiles.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@
%
% .. Authors: - Original Code: Laurent Heirendt
% - Move to function: Thomas Pfau, Jan 2018
%
% NOTE:
% this function has been adapted from
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/install/getIgnoredFiles.m
% [f9a9213]



global CELLFIEDIR

fid = fopen([CELLFIEDIR filesep '.gitignore']);
Expand Down
1 change: 0 additions & 1 deletion test/base/restoreEnvironment.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ function restoreEnvironment(environment, restorePath, printLevel)
% printLevel: Set the verbosity of this method:
% * 0: No outputs (Default)
% * 1: Info what each value is set to
%
% NOTE:
% this function has been adapted from
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/restoreEnvironment.m
Expand Down
3 changes: 1 addition & 2 deletions test/base/runScriptFile.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function result = runScriptFile(fileName)
% This function runs the test in fileName
% It can distinguish between skipped and Failed tests. A test is considered
% to be skipped if it throws a COBRA:RequirementsNotMet error.
% to be skipped if it throws a CELLFIE:RequirementsNotMet error.
%
% OUTPUTS:
%
Expand All @@ -23,7 +23,6 @@
% https://github.com/opencobra/cobratoolbox/blob/master/test/runScriptFile.m
% [b58da0c]


global CBT_MISSING_REQUIREMENTS_ERROR_ID

CELLFIE_TESTSUITE_TESTFILE = fileName;
Expand Down
1 change: 0 additions & 1 deletion test/base/runTestSuite.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
% https://github.com/opencobra/cobratoolbox/blob/master/test/runTestSuite.m
% [5395578]


global CELLFIEDIR

if ~exist('testNames','var')
Expand Down
3 changes: 1 addition & 2 deletions test/base/setGlobal.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ function setGlobal(globalName,globalValue)
%
% INPUTS:
% globalName: A string representing the name of the global variable
% globalValue: The value to set the global variable
% globalValue: The value to set the global variable to
%
% NOTE:
% this function has been adapted from
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/setGlobal.m
% [e6b4efd]


eval([ globalName '_val = globalValue;']);
eval(['global ' globalName]);
eval([globalName ' = ' globalName '_val;']);
Expand Down

0 comments on commit 5c95905

Please sign in to comment.