Skip to content

Commit af0ab0b

Browse files
committed
client: remove environment checks for xlx and intel subcommands
At least in the intel/quartus world this is a problem as those variables change between versions. Also the commands just will raise with command not found exceptions which is a clear indicator to the user.
1 parent de7bb1b commit af0ab0b

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

labgrid/remote/client.py

-15
Original file line numberDiff line numberDiff line change
@@ -1287,11 +1287,6 @@ def write_files(self):
12871287
except FileNotFoundError as e:
12881288
raise UserError(e)
12891289

1290-
def _check_xlx_env(self):
1291-
if not "XILINX_VIVADO" in os.environ:
1292-
print("xlx subcommands must be invoked from within a Vivado environment", file=sys.stderr)
1293-
exit(1)
1294-
12951290
def _get_xlx(self, name):
12961291
place = self.get_acquired_place()
12971292
target = self._get_target(place)
@@ -1312,23 +1307,20 @@ def _get_xlx(self, name):
13121307
return drv
13131308

13141309
def xlx_run_xsdb(self):
1315-
self._check_xlx_env()
13161310
drv = self._get_xlx(self.args.resource)
13171311

13181312
processwrapper.enable_print()
13191313
drv.run([self.args.tcl_cmds])
13201314
processwrapper.disable_print()
13211315

13221316
def xlx_program_bitstream(self):
1323-
self._check_xlx_env()
13241317
drv = self._get_xlx(self.args.resource)
13251318

13261319
processwrapper.enable_print()
13271320
drv.program_bitstream(self.args.bitstream)
13281321
processwrapper.disable_print()
13291322

13301323
def xlx_force_bootmode(self):
1331-
self._check_xlx_env()
13321324
drv = self._get_xlx(self.args.resource)
13331325
drv.force_bootmode_reset(self.args.bootmode.lower())
13341326

@@ -1352,7 +1344,6 @@ def _get_quartus(self, name):
13521344
return drv
13531345

13541346
def intel_program_bitstream(self):
1355-
self._check_intel_env()
13561347
drv = self._get_quartus(self.args.resource)
13571348
processwrapper.enable_print()
13581349
ret, stdout, stderr = drv.flash(self.args.bitstream)
@@ -1363,12 +1354,6 @@ def intel_program_bitstream(self):
13631354
raise QuartusPgmDriverError(stdout, stderr)
13641355
processwrapper.disable_print()
13651356

1366-
def _check_intel_env(self):
1367-
if not "QUARTUS_ROOTDIR" in os.environ:
1368-
print("Quartus subcommands must be invoked from within a Quartus environment", file=sys.stderr)
1369-
exit(1)
1370-
return
1371-
13721357
def write_image(self):
13731358
place = self.get_acquired_place()
13741359
target = self._get_target(place)

0 commit comments

Comments
 (0)