Skip to content
Snippets Groups Projects
Commit eb6ddc5f authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

minor tweaks in an attempt to fix an intermittent failure -- adjusted...

minor tweaks in an attempt to fix an intermittent failure -- adjusted iteration in the source and did cleanup to ensure tempdir doesn't exist before testing
parent 6e80aa1a
No related branches found
No related tags found
No related merge requests found
#!/bin/bash
set -e
set -x
# set -x
trap clean EXIT
pushd $CICD_MODULE_WORK_DIR/cfi_umbrella
source set_env_vars
popd
cd ./scfi/tests/cicd_tests/fib_src
#pushd ..
#source set_env_vars
#popd
cd ../scfi/tests/cicd_tests/fib_src
source ../../cfi_smokescreen_configs.sh
......
......@@ -3,9 +3,11 @@
set -e
set -x
pushd $CICD_MODULE_WORK_DIR/cfi_umbrella
pushd .
source set_env_vars
popd
cd ./xeon/tests/
rm -rf peasoup_exe*;
./test_dude.sh || exit 1
......@@ -36,11 +36,8 @@ bool XeonInstr::InstrumentIndBranches(void)
firp->assembleRegistry();
firp->setBaseIDS();
auto insn_set = firp->getInstructions();
for(InstructionSet_t::iterator it=insn_set.begin();
it!=insn_set.end();
++it)
for(auto curr_insn : insn_set )
{
Instruction_t* curr_insn = *it;
// filter out IndBranches we don't want to put checks on, depending on the settings
const auto curr_insn_asmp=DecodedInstruction_t::factory(curr_insn);
......@@ -91,11 +88,8 @@ bool XeonInstr::InstrumentIBTargets(void)
firp->assembleRegistry(); // make sure preds' assembly is updated
firp->setBaseIDS();
auto insn_set = firp->getInstructions();
for(InstructionSet_t::iterator it=insn_set.begin();
it!=insn_set.end();
++it)
for(auto curr_insn : insn_set)
{
Instruction_t* curr_insn = *it;
if(curr_insn->getIndirectBranchTargetAddress()!=NULL || DecodedInstruction_t::factory(curr_insn)->isCall())
{
exe_nonce_manager.Noncify(curr_insn);
......@@ -452,10 +446,8 @@ void XeonInstr::mov_reloc(Instruction_t* from, Instruction_t* to, string type )
Relocation_t* XeonInstr::HasRelocation(Instruction_t* insn, string type) const
{
RelocationSet_t::iterator rit;
for( rit=insn->getRelocations().begin(); rit!=insn->getRelocations().end(); ++rit)
for(auto reloc : insn->getRelocations())
{
Relocation_t* reloc= *rit;
if(reloc->getType()==type)
{
return reloc;
......
#!/bin/bash
set -e
#
# globals
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment